Browse Source

删除多余字段

helixiao 1 year ago
parent
commit
70e9ef917b

+ 2 - 2
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -929,8 +929,8 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserVo.getSysUser();
         if (sysUserVo.getIsPartner() != null && sysUserVo.getIsPartner().equals("1")) {
             SysUserInfo sysUserInfo = new SysUserInfo();
-            SysUser partnerId = sysUserService.getById(sysUserVo.getSysUser().getReferrerId());
-            sysUser.setDeptId(partnerId.getDeptId());
+            SysUser sysUser1 = sysUserService.getById(sysUserVo.getSysUser().getReferrerId());
+            sysUser.setDeptId(sysUser1.getDeptId());
             sysUser.setStatus(2); //直接默认为入司待审核
             LocalDate birthday = LocalDate.parse(sysUser.getIdentity().substring(6, 10) + "-" + sysUser.getIdentity().substring(10, 12) + "-" + sysUser.getIdentity().substring(12, 14));
             sysUserInfo.setBirthday(birthday);

+ 0 - 8
src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -236,14 +236,6 @@ public class SysUser extends BaseEntity {
     @ApiModelProperty(value = "合伙人等级;1,2,3,4,5")
     private Integer level;
 
-    @ApiModelProperty(value = "推荐人id")
-    @TableField(exist = false)
-    private String suggestId;
-
-    @ApiModelProperty(value = "推荐人name")
-    @TableField(exist = false)
-    private String suggestName;
-
     @ApiModelProperty(value = "申请机构来源 1 渠道 2 个代")
     @TableField(value = "dept_source")
     private String deptSource;

+ 0 - 2
src/main/java/com/ydtech/modules/admin/model/vo/SysUser2Vo.java

@@ -25,8 +25,6 @@ public class SysUser2Vo {
     @ApiModelProperty("是否是合伙人")
     private String isPartner;
 
-    @ApiModelProperty("推荐人Id")
-    private String referrerId;
 
     @ApiModelProperty("影像信息")
     private List<EsmUserImageVo> esmUserImageVo;

+ 5 - 3
src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -955,8 +955,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
                 }
                 userInfo.setId(sysUser.getId());
+            }else {
+                userInfo=new SysUserInfo();
+                userInfo.setId(sysUser.getId());
             }
-//        userInfo.setId(sysUser.getId());
             sysUserInfoService.save(userInfo);
         }
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
@@ -965,7 +967,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
             esmUserImageService.saveBatch(esmUserImages);
         }
-        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getReferrerId()).orElse("admin") );
+        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getSysUser().getReferrerId()).orElse("admin") );
         return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }
 
@@ -1128,7 +1130,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
             esmUserImageService.saveBatch(esmUserImages);
         }
-        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getReferrerId()).orElse("admin"));
+        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getSysUser().getReferrerId()).orElse("admin"));
         return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }