Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -215,7 +215,9 @@ public class SysUserController {
                       @RequestParam(name = "veterId",required = false) String veterId,
                       @RequestParam(name = "address",required = false) String address,//身份证地址
                       @RequestParam(name = "detailedAddress") String detailedAddress,//详细地址
-                      @RequestParam(name = "detailedAdressCode") String detailedAdressCode//地址行政码
+                      @RequestParam(name = "detailedAdressCode") String detailedAdressCode,//地址行政码,
+                      @RequestParam(name = "companyName",required = false) String companyName,//企业法人姓名
+                      @RequestParam(name = "companyCode",required = false) String companyCode//企业法人身份证号
     ) throws IOException {
         req.setCharacterEncoding("UTF-8");
         System.out.println(userName);
@@ -239,6 +241,8 @@ public class SysUserController {
         map.put("farmName", farmName);
         map.put("address", address);
         map.put("detailedAddress", detailedAddress);
+        map.put("companyName", companyName);
+        map.put("companyCode", companyCode);
 
         Result result = iSysUserService.add(req, map);
         if (result.getCode() == 10000) {

admin/src/main/java/com/huimv/farm/damsubsidy/entity/SysUser.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author author
@@ -122,4 +122,9 @@ public class SysUser extends BaseEntity implements Serializable {
 
     /*最后一级地址行政码*/
     private String briefAddressCode;
+
+    /*企业法人姓名*/
+    private String companyName;
+    /*企业法人身份证号*/
+    private String companyCode;
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -237,6 +237,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setBriefAddressCode(split[split.length - 1]);
             user.setAccoutType(1);
             user.setIsRealName(1);
+            user.setCompanyName(paramsMap.get("companyName"));
+            user.setCompanyCode(paramsMap.get("companyCode"));
             QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone",TokenSign.getPhone(httpServletRequest));
             Integer integer = userMapper.selectCount(queryWrapper);

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/SysUserMapper.xml

@@ -20,6 +20,8 @@
         <result column="update_user" property="updateUser" />
         <result column="is_delete" property="isDelete" />
         <result column="last_ip" property="lastIp" />
+        <result column="company_name" property="companyName"/>
+        <result column="company_code" property="companyCode"/>
     </resultMap>
 
 </mapper>