Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -230,7 +230,10 @@ public class SysLoginController {
                 throw new SystemException("该用户未授权");
             }
         }
-        user.setIsLock(0);
+        SysUser sysUser = sysUserService.getByUserId(user.getId());
+        if ("2".equals(sysUser.getManagementSource())){
+            user.setIsLock(0);
+        }
         //验证用户
         SysUser.verifyUser(user);
         SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
@@ -396,7 +399,10 @@ public class SysLoginController {
         String phoneMsg = phoneLoginVo.getPhoneMsg();
         SysUser user = sysUserService.findByPhone(phone);
         //验证用户
-        user.setIsLock(0);
+        SysUser sysUser = sysUserService.getByUserId(user.getId());
+        if ("2".equals(sysUser.getManagementSource())){
+            user.setIsLock(0);
+        }
         SysUser.verifyUser(user);
         String msg = redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + phone);
         if (msg == null || msg.isEmpty()) {