合并消息服务

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

@@ -1,7 +1,6 @@
 package com.xy.service;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -96,16 +95,15 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("添加")
     @Lock(value = "save.tel", prefix = "user_save_")
     public R<UserInfoDto.Vo> save(UserInfoDto.Save save) {
-        //校验
-        UserInfo userInfo = getOne(new LambdaQueryWrapper<UserInfo>()
-                .eq(UserInfo::getTel, save.getTel())
-                .or()
-                .eq(UserInfo::getMail, save.getMail())
-                .or()
+        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<UserInfo>()
                 .eq(UserInfo::getUnionid, save.getUnionid())
                 .or()
-                .eq(UserInfo::getAuthorizeUserId, save.getAuthorizeUserId())
-        );
+                .eq(UserInfo::getAuthorizeUserId, save.getAuthorizeUserId());
+        //校验
+        if (Emptys.check(save.getMail())) {
+            lambdaQueryWrapper.or().eq(UserInfo::getMail, save.getMail());
+        }
+        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));
         }
@@ -113,16 +111,18 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         AddDto addDto = copy(AddDto.class, save)
                 .setEmail(save.getMail())
                 .setPhone(save.getTel())
-                .setAccount(StrUtil.isNotEmpty(save.getAccount()) ? save.getAccount() : save.getTel());
+                .setAccount(save.getAccount());
         Long authorizeUserId = sysWorkUserService.register(addDto).getData();
         if (!Emptys.check(authorizeUserId)) {
             return R.fail("新增权限用户失败");
         }
         //添加用户
-        UserInfo saveInfo = copy(UserInfo.class, save).createUserTime(AuthorizeUtils.getLoginId(Long.class))
+        Long loginId = AuthorizeUtils.getLoginId(Long.class);
+        UserInfo saveInfo = copy(UserInfo.class, save)
+                .createUserTime(loginId)
                 .setUserId(YitIdHelper.nextId())
                 .setAuthorizeUserId(authorizeUserId)
-                .createUserTime(AuthorizeUtils.getLoginId(Long.class));
+                .createUserTime(loginId);
         save(saveInfo);
         return R.ok(copy(UserInfoDto.Vo.class, saveInfo));
     }

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

@@ -65,6 +65,7 @@ public class UserInfoDto {
     @Data
     @Accessors(chain = true)
     public static class Save extends Vo {
+
         @NotNull(message = "sysIds不能为空")
         @ApiModelProperty("系统id集合")
         private String sysIds;
@@ -72,11 +73,11 @@ public class UserInfoDto {
         @ApiModelProperty("系统id")
         private Long sysId;
 
+        @NotBlank(message = "account不能为空")
         @ApiModelProperty(value = "登录账号")
         private String account;
 
-
-        @NotBlank(message = "账户名称不能为空")
+        @NotBlank(message = "name不能为空")
         @ApiModelProperty(value = "账户名称", required = true)
         private String name;
 
@@ -90,7 +91,7 @@ public class UserInfoDto {
         private String mail;
 
         @ApiModelProperty(value = "密码", required = true)
-        @NotBlank(message = "密码不可为空")
+        @NotBlank(message = "password不可为空")
         @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
         private String password;