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

takai-framework/src/main/java/com/takai/framework/web/service/FrameLoginService.java

@@ -181,8 +181,8 @@ public class FrameLoginService
 
     private SysUser checkUserExist(FrameLoginBody loginBody) {
         SysUser sysUser = userService.selectUserByUserName(loginBody.getUserName());
-        if(sysUser == null) {
-            return null;
+        if(sysUser != null) {
+            return sysUser;
         }
         String newUserName = loginBody.getUserName();
         //慧监理
@@ -197,14 +197,10 @@ public class FrameLoginService
             loginBody.setUserType(UserTypeEnum.OTHER_USER.getCode());
             newUserName = loginBody.getUserName()+"_OTHER";
         }
-        if(UserTypeEnum.JK_USER.getCode().equals(sysUser.getUserType())
-                || sysUser.getUserType().equals(loginBody.getUserType())) {
-            return sysUser;
-        } else {
-            loginBody.setUserName(newUserName);
-        }
+        loginBody.setUserName(newUserName);
+        sysUser = userService.selectUserByUserName(loginBody.getUserName());
 
-        return checkUserExist(loginBody);
+        return sysUser;
     }
 
     public boolean checkToken(String token){