From fe2856826d978b2a231ea684231459d7d3b22e1e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 17:14:49 +0900
Subject: [PATCH] 일반 사용자 로그인시 상단 프로젝트 목록과 프로젝트 메뉴의 목록 개수가 다른 문제 해결
---
src/main/resources/mybatis/query-template/project-template.xml | 11 +++++++++++
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 4 +++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 55a5b18..6689f61 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -1082,7 +1082,7 @@
projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
projectCondition.setProjectType(projectType);
projectCondition.setStatuses(statuses);
-
+ this.SetMyDepartmentId(projectCondition);
return this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
@@ -1091,6 +1091,7 @@
public List<Map<String, Object>> findByWorkspaceIdAndIncludeProject(ProjectCondition projectCondition) {
projectCondition.setLoginUserId(this.webAppUtil.getLoginId());
projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ this.SetMyDepartmentId(projectCondition);
return this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
@@ -1139,6 +1140,7 @@
|| MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
} else {
+ this.SetMyDepartmentId(projectCondition);
results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
List<ProjectVo> projectVos = this.makeProjectByVos(results);
diff --git a/src/main/resources/mybatis/query-template/project-template.xml b/src/main/resources/mybatis/query-template/project-template.xml
index 388e063..ed1a5fd 100644
--- a/src/main/resources/mybatis/query-template/project-template.xml
+++ b/src/main/resources/mybatis/query-template/project-template.xml
@@ -486,6 +486,17 @@
AND p.name like CONCAT('%',#{name},'%')
</if>
<choose>
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND prd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ <otherwise>
+ AND 1 != 1
+ </otherwise>
+ </choose>
+ <choose>
<when test="statuses.size != 0">
AND p.status IN
<foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
--
Gitblit v1.8.0