Sfoglia il codice sorgente

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

785834757 1 anno fa
parent
commit
edee5a3da3

+ 6 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysLoginServiceImpl.java

@@ -7,7 +7,9 @@ import com.ydtech.constants.SysConstants;
 import com.ydtech.constants.sys.SysPasswordEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.constants.ManagementSource;
 import com.ydtech.modules.admin.constants.UserWorkStatus;
+import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysPassword;
 import com.ydtech.modules.admin.model.SysRole;
 import com.ydtech.modules.admin.model.SysUser;
@@ -38,6 +40,8 @@ public class SysLoginServiceImpl implements SysLoginService {
 
     private final SysUserRoleService sysUserRoleService;
 
+    private final SysDeptService sysDeptService;
+
     @Override
     public HttpResult<String> loginApp(LoginBean loginBean) {
         this.verifyTheVerificationCode(loginBean);
@@ -90,8 +94,8 @@ public class SysLoginServiceImpl implements SysLoginService {
                 throw new SystemException("该用户未授权");
             }
         }
-
-        if ("2".equals(user.getManagementSource())) {
+        SysDept sysDept = sysDeptService.getById(user.getDeptId());
+        if (ManagementSource.MS_02.getCode().equals(sysDept.getManagementSource())) {
             user.setIsLock(0);
         }
         //验证用户