Browse Source

修复bug

zhaopeiqing 7 months ago
parent
commit
4547c11607

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -116,6 +116,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         if (reqVO.getScene() != 5 && userService.getUserByMobile(reqVO.getMobile()) == null) {
             throw exception(AUTH_MOBILE_NOT_EXISTS);
         }
+        if (reqVO.getScene() == 5 && userService.getUserByUsername(reqVO.getMobile()) != null) {
+            throw exception(USER_USERNAME_EXISTS);
+        }
         // 发送验证码
         smsCodeApi.sendSmsCode(AuthConvert.INSTANCE.convert(reqVO).setCreateIp(getClientIP()));
     }

+ 5 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -228,7 +228,9 @@ public class AdminUserServiceImpl implements AdminUserService {
     public void updateUserPassword(Long id, String password) {
         // 1. 校验用户存在
         AdminUserDO user = validateUserExists(id);
-
+        if (!ValidationUtils.isValidPassword(password)) {// 校验密码
+            throw exception(USER_PASSWORD_SIMPLE_FAILED);
+        }
         // 2. 更新密码
         AdminUserDO updateObj = new AdminUserDO();
         updateObj.setId(id);
@@ -271,11 +273,13 @@ public class AdminUserServiceImpl implements AdminUserService {
     }
 
     @Override
+    @TenantIgnore
     public AdminUserDO getUserByUsername(String username) {
         return userMapper.selectByUsername(username);
     }
 
     @Override
+    @TenantIgnore
     public AdminUserDO getUserByMobile(String mobile) {
         return userMapper.selectByMobile(mobile);
     }