联登优化

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

@@ -99,6 +99,7 @@ public class FrameLoginService
 
     public Map<String, Object> login(FrameLoginBody loginBody)
     {
+        String message = "";
         //用户不存在或者非建科用户则添加用户
         SysUser sysUser = checkUserExist(loginBody);
         if (sysUser == null) {
@@ -116,7 +117,10 @@ public class FrameLoginService
         //项目不存在则添加项目
         SysProject sysProject = sysProjectService.selectSysProjectByProjectPid(loginBody.getWorkspaceCode());
         if(sysProject == null) {
-            throw new ServiceException("项目"+loginBody.getWorkspaceCode()+"不存在，请联系管理员");
+            message = "项目"+loginBody.getWorkspaceCode()+"不存在，请联系管理员";
+            log.info("项目"+loginBody.getWorkspaceCode()+"不存在，请联系管理员");
+
+            //throw new ServiceException("项目"+loginBody.getWorkspaceCode()+"不存在，请联系管理员");
 //            sysProject = new SysProject();
 //            sysProject.setProjectPid(loginBody.getWorkspaceId());
 //            sysProject.setProjectName(loginBody.getWorkspaceName());
@@ -124,17 +128,19 @@ public class FrameLoginService
 //            sysProject.setCreateBy("frameLogin");
 //            sysProject.setCreateTime(DateUtils.getNowDate());
 //            sysProjectService.insertSysProject(sysProject);
-        }
+        } else {
 
-        //项目用户不存在则添加项目用户
-        SysProjectStaff sysProjectStaff = new SysProjectStaff();
-        sysProjectStaff.setProjectPid(loginBody.getWorkspaceCode());
-        sysProjectStaff.setUserName(loginBody.getUserName());
-        sysProjectStaff.setUserId(sysUser.getUserId());
-        SysProjectStaff staff =  sysProjectStaffService.selectSysProjectStaff(sysProjectStaff);
-        if(staff == null) {
-            throw new ServiceException("用户"+loginBody.getUserName() +"不是项目"+loginBody.getWorkspaceCode()+"的成员，请联系管理员");
-            //sysProjectStaffService.insertSysProjectStaff(sysProjectStaff);
+            //项目用户不存在则添加项目用户
+            SysProjectStaff sysProjectStaff = new SysProjectStaff();
+            sysProjectStaff.setProjectPid(loginBody.getWorkspaceCode());
+            sysProjectStaff.setUserName(loginBody.getUserName());
+            sysProjectStaff.setUserId(sysUser.getUserId());
+            SysProjectStaff staff = sysProjectStaffService.selectSysProjectStaff(sysProjectStaff);
+            if (staff == null) {
+                message = "用户" + loginBody.getUserName() + "不是项目" + loginBody.getWorkspaceCode() + "的成员，请联系管理员";
+                // new ServiceException("用户"+loginBody.getUserName() +"不是项目"+loginBody.getWorkspaceCode()+"的成员，请联系管理员");
+                //sysProjectStaffService.insertSysProjectStaff(sysProjectStaff);
+            }
         }
         String username = "";
         // 用户验证
@@ -178,6 +184,7 @@ public class FrameLoginService
         map.put("userId", loginUser.getUserId());
         map.put("nickName", loginUser.getUser().getNickName());
         map.put("token", login_token);
+        map.put("msg", message);
         return map;
     }