Skip to content

B
brandkbs2
Commit d448155c by 陈健智
Options

用户管理再调整

parent 10d8acab
Showing with 6 additions and 4 deletions
src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java
...@@ -436,8 +436,9 @@ public class UserServiceImpl implements UserService { ...@@ -436,8 +436,9 @@ public class UserServiceImpl implements UserService {
for (UserRole role : roles) { for (UserRole role : roles) {
String projectId = role.getProjectId(); String projectId = role.getProjectId();
// 已终止/已删除的项目不返回 // 已终止/已删除的项目不返回
Project project = projectDao.findOneById(projectId); Project project = GlobalPojo.PROJECT_MAP.get(projectId);
if ((Objects.isNull(GlobalPojo.PROJECT_MAP.get(projectId)) && Objects.isNull(project)) || !project.isStart()){ project = Objects.isNull(project) ? projectDao.findOneById(projectId) : project;
if (Objects.isNull(project) || !project.isStart()){
continue; continue;
} }
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -519,8 +520,9 @@ public class UserServiceImpl implements UserService { ...@@ -519,8 +520,9 @@ public class UserServiceImpl implements UserService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
String projectId = role.getProjectId(); String projectId = role.getProjectId();
// 已终止/已删除的项目不返回 // 已终止/已删除的项目不返回
Project project = projectDao.findOneById(projectId); Project project = GlobalPojo.PROJECT_MAP.get(projectId);
if ((Objects.isNull(GlobalPojo.PROJECT_MAP.get(projectId)) && Objects.isNull(project)) || !project.isStart()){ project = Objects.isNull(project) ? projectDao.findOneById(projectId) : project;
if (Objects.isNull(project) || !project.isStart()){
return null; return null;
} }
json.put("projectName", project.getProjectName()); json.put("projectName", project.getProjectName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment