慧监理，慧项管项目和成员以同步的信息为准，不存在不再创建

takai-admin/src/main/java/com/takai/web/controller/system/SysLoginController.java

@@ -236,9 +236,15 @@ public class SysLoginController
             SysUser user = loginUser.getUser();
             // 角色集合
             Set<String> roles = permissionService.getRolePermission(user);
-            //非系统用户，没有分配角色的，默认分配普通用户角色
-            if(roles.isEmpty() && !UserTypeEnum.SYS_USER.getCode().equals(user.getUserType())) {
-                userService.insertUserAuth(user.getUserId(),new Long[]{2L});
+
+            if(roles.isEmpty()) {
+                //建科用户，没有分配角色的，默认分配普通用户角色
+                if(UserTypeEnum.JK_USER.getCode().equals(user.getUserType())) {
+                    userService.insertUserAuth(user.getUserId(), new Long[]{2L});
+                //非系统用户，非建科用户，没有分配角色的，默认分配为游客用户角色
+                } else if(!UserTypeEnum.SYS_USER.getCode().equals(user.getUserType())) {
+                    userService.insertUserAuth(user.getUserId(), new Long[]{3L});
+                }
                 List<SysRole> userRoles = roleService.selectRolesByUserId(user.getUserId());
                 user.setRoles(userRoles);
             }

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

@@ -115,13 +115,14 @@ public class FrameLoginService
         //项目不存在则添加项目
         SysProject sysProject = sysProjectService.selectSysProjectByProjectPid(loginBody.getWorkspaceId());
         if(sysProject == null) {
-            sysProject = new SysProject();
-            sysProject.setProjectPid(loginBody.getWorkspaceId());
-            sysProject.setProjectName(loginBody.getWorkspaceName());
-            sysProject.setSourceFrom(loginBody.getClientId());
-            sysProject.setCreateBy("frameLogin");
-            sysProject.setCreateTime(DateUtils.getNowDate());
-            sysProjectService.insertSysProject(sysProject);
+            throw new ServiceException("项目"+loginBody.getWorkspaceId()+"不存在，请联系管理员");
+//            sysProject = new SysProject();
+//            sysProject.setProjectPid(loginBody.getWorkspaceId());
+//            sysProject.setProjectName(loginBody.getWorkspaceName());
+//            sysProject.setSourceFrom(loginBody.getClientId());
+//            sysProject.setCreateBy("frameLogin");
+//            sysProject.setCreateTime(DateUtils.getNowDate());
+//            sysProjectService.insertSysProject(sysProject);
         }
 
         //项目用户不存在则添加项目用户
@@ -131,7 +132,8 @@ public class FrameLoginService
         sysProjectStaff.setUserId(sysUser.getUserId());
         SysProjectStaff staff =  sysProjectStaffService.selectSysProjectStaff(sysProjectStaff);
         if(staff == null) {
-            sysProjectStaffService.insertSysProjectStaff(sysProjectStaff);
+            throw new ServiceException("用户"+loginBody.getUserName() +"不是项目"+loginBody.getWorkspaceId()+"的成员，请联系管理员");
+            //sysProjectStaffService.insertSysProjectStaff(sysProjectStaff);
         }
         String username = "";
         // 用户验证