#MOD 商户管理员登录名、密码重置。授权反显商户名。树表搜索。

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

@@ -135,6 +135,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @Lock(value = "update.userId", prefix = "user_update_")
     public R update(UserInfoDto.Update update) {
         UserInfo byId = getById(update.getUserId());
+        String account = update.getAccount();
+
         if (!StringUtils.isEmpty(update.getTel())) {
             if (!byId.getTel().equals(update.getTel())) {
                 long count = count(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getTel, update.getTel()));
@@ -157,6 +159,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         if (Emptys.check(update.getTel()) || Emptys.check(update.getMail()) || Emptys.check(update.getStatus()) || Emptys.check(update.getPassword())) {
             UpdateDto updateDto = new UpdateDto()
                     .setId(byId.getAuthorizeUserId())
+                    .setAccount(account)
                     .setPhone(update.getTel())
                     .setEmail(update.getMail())
                     .setPassword(update.getPassword())

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

@@ -102,6 +102,10 @@ public class UserInfoDto {
     @Accessors(chain = true)
     public static class Update {
 
+        @ApiModelProperty(value = "登录名")
+        private String account;
+
+
         @ApiModelProperty(value = "用户昵称")
         private String name;
 
@@ -118,7 +122,7 @@ public class UserInfoDto {
         private String mail;
 
         @ApiModelProperty(value = "密码", required = true)
-        @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
+//        @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
         private String password;
 
         @ApiModelProperty(value = "用户类型")