update: pc 和 app 登录分开

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -30,6 +30,7 @@ public class TokenInterceptor {
 
         notMatchList.add("/captchaById"); // 验证码通过ID
         notMatchList.add("/login2");//登录2  配合验证码ID的校验
+        notMatchList.add("/system/login");//登录PC
         notMatchList.add("/aapLogin");//合伙人和机构负责人登录APP接口
         notMatchList.add("/loginAPPByPhone");//合伙人和机构负责人登录APP接口
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -388,7 +388,7 @@ public interface SysUserService extends BaseIService<SysUser> {
     default SysUser judgmentIncumbency(String id) {
         SysUser user = getById(id);
         if (!UserWorkStatus.UWS_1.getCode().equals(user.getStatus())) {
-            throw new SystemException("请联系管理员审核人员信息");
+            throw new SystemException("审核未通过、请联系管理员");
         }
         return user;
     }

src/main/java/com/ydtech/modules/admin/service/impl/SysLoginServiceImpl.java

@@ -55,10 +55,7 @@ public class SysLoginServiceImpl implements SysLoginService {
         String username = loginBean.getAccount();
         String password = loginBean.getPassword();
         // 用户信息
-        SysUser user = sysUserService.getById(username);
-        if (!UserWorkStatus.UWS_1.getCode().equals(user.getStatus())) {
-            throw new SystemException("请联系管理员审核人员信息");
-        }
+        SysUser user = sysUserService.judgmentIncumbency(username);
         return getHttpResult(loginBean, username, user, password);
     }