修改用户体系

sys-api-service/src/main/java/com/xy/entity/UserInfo.java

@@ -42,8 +42,8 @@ public class UserInfo extends BaseEntity3<UserInfo> implements Serializable {
     @ApiModelProperty(value = "微信开放平台识别码")
     private String unionid;
 
-    @ApiModelProperty(value = "系统id集合")
-    private String sysIds;
+    @ApiModelProperty(value = "系统id")
+    private Long sysId;
 
     @ApiModelProperty(value = "权限系统用户id")
     private Long authorizeUserId;

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
-import java.util.StringJoiner;
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
@@ -64,9 +63,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @Override
     @ApiOperation("对象查询")
     public R<UserInfoDto.Vo> obj(UserInfoDto.Vo vo) {
-        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(vo, UserInfo.class)
-                .like(UserInfo::getSysIds, vo.getSysIds())
-                .build();
+        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(vo, UserInfo.class).build();
         List<UserInfo> list = list(lambdaQueryWrapper);
         if (Emptys.check(list)) {
             return R.ok(copy(UserInfoDto.Vo.class, list.get(0)));
@@ -82,7 +79,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                 .like(UserInfo::getTel, page.getTel())
                 .like(UserInfo::getMail, page.getMail())
                 .like(UserInfo::getUnionid, page.getUnionid())
-                .like(UserInfo::getSysIds, page.getSysIds())
                 .ge(UserInfo::getCreateTime, page.getBeginCreateTime())
                 .le(UserInfo::getCreateTime, page.getEndCreateTime())
                 .build()
@@ -95,27 +91,34 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("添加")
     @Lock(value = "save.tel", prefix = "user_save_")
     public R<UserInfoDto.Vo> save(UserInfoDto.Save save) {
-        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<UserInfo>()
-                .eq(UserInfo::getUnionid, save.getUnionid())
-                .or()
-                .eq(UserInfo::getAuthorizeUserId, save.getAuthorizeUserId());
         //校验
-        if (Emptys.check(save.getMail())) {
-            lambdaQueryWrapper.or().eq(UserInfo::getMail, save.getMail());
+        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<UserInfo>()
+                .eq(UserInfo::getMail, save.getMail());
+        if (Emptys.check(save.getUnionid())) {
+            lambdaQueryWrapper
+                    .or()
+                    .eq(UserInfo::getUnionid, save.getUnionid());
+        }
+        if (Emptys.check(save.getSysId())) {
+            lambdaQueryWrapper
+                    .or(userInfoLambdaQueryWrapper -> userInfoLambdaQueryWrapper
+                            .eq(UserInfo::getTel, save.getTel())
+                            .eq(UserInfo::getSysId, save.getSysId()));
         }
         UserInfo userInfo = getOne(lambdaQueryWrapper);
         if (userInfo != null) {
-            return R.fail(R.Enum.USER_EXIST.getCode(), R.Enum.USER_EXIST.getMsg(), copy(UserInfoDto.Vo.class, userInfo));
+            return R.fail("账号已存在");
         }
         //添加权限用户
         AddDto addDto = copy(AddDto.class, save)
                 .setEmail(save.getMail())
                 .setPhone(save.getTel())
                 .setAccount(save.getAccount());
-        Long authorizeUserId = sysWorkUserService.register(addDto).getData();
-        if (!Emptys.check(authorizeUserId)) {
-            return R.fail("新增权限用户失败");
+        R<Long> register = sysWorkUserService.register(addDto);
+        if (register.getCode() != R.Enum.SUCCESS.getCode()) {
+            return R.fail(register.getMsg());
         }
+        Long authorizeUserId = register.getData();
         //添加用户
         Long loginId = AuthorizeUtils.getLoginId(Long.class);
         UserInfo saveInfo = copy(UserInfo.class, save)
@@ -136,23 +139,20 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             if (!byId.getTel().equals(update.getTel())) {
                 long count = count(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getTel, update.getTel()));
                 if (count > 0) {
-                    return R.fail("手机号已存在");
+                    return R.fail("手机已存在");
                 }
             }
         }
         if (!StringUtils.isEmpty(update.getMail())) {
             if (!byId.getMail().equals(update.getMail())) {
-                long count = count(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getTel, update.getMail()));
+                long count = count(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getMail, update.getMail()));
                 if (count > 0) {
                     return R.fail("邮箱已存在");
                 }
             }
         }
-        //系统累加
-        if (Emptys.check(update.getSysIds())) {
-            update.setSysIds(byId.getSysIds().indexOf(update.getSysIds()) == -1 ? new StringJoiner(",").add(byId.getSysIds()).add(update.getSysIds()).toString() : null);
-        }
-        UserInfo updateInfo = copy(UserInfo.class, update).updateUserTime(AuthorizeUtils.getLoginId(Long.class));
+        UserInfo updateInfo = copy(UserInfo.class, update)
+                .updateUserTime(AuthorizeUtils.getLoginId(Long.class));
         //修改权限用户
         if (Emptys.check(update.getTel()) || Emptys.check(update.getMail()) || Emptys.check(update.getStatus()) || Emptys.check(update.getPassword())) {
             UpdateDto updateDto = new UpdateDto()

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -66,11 +66,8 @@ public class UserInfoDto {
     @Accessors(chain = true)
     public static class Save extends Vo {
 
-        @NotNull(message = "sysIds不能为空")
-        @ApiModelProperty("系统id集合")
-        private String sysIds;
-
-        @ApiModelProperty("系统id")
+        @NotNull(message = "sysId不能为空")
+        @ApiModelProperty(value = "系统id")
         private Long sysId;
 
         @NotBlank(message = "account不能为空")
@@ -86,6 +83,7 @@ public class UserInfoDto {
         @Pattern(regexp = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,2-9])|(19[0,2-9]))\\d{8}$", message = "phone格式错误")
         private String tel;
 
+        @NotBlank(message = "mail不能为空")
         @ApiModelProperty(value = "邮件")
         @Pattern(regexp = "^(\\w+([-.][A-Za-z0-9]+)*){3,18}@\\w+([-.][A-Za-z0-9]+)*\\.\\w+([-.][A-Za-z0-9]+)*$", message = "email格式错误")
         private String mail;
@@ -129,9 +127,6 @@ public class UserInfoDto {
         @ApiModelProperty(value = "状态")
         private Boolean status;
 
-        @ApiModelProperty(value = "系统id集合")
-        private String sysIds;
-
         @ApiModelProperty(value = "角色ID(数组)")
         private List<Long> roleIds;
     }
@@ -155,8 +150,8 @@ public class UserInfoDto {
         @ApiModelProperty(value = "微信开放平台识别码")
         private String unionid;
 
-        @ApiModelProperty(value = "系统id集合")
-        private String sysIds;
+        @ApiModelProperty(value = "系统id")
+        private Long sysId;
 
         @ApiModelProperty(value = "权限系统用户id")
         private Long authorizeUserId;