From f1193f1f75c7ac1f5f2df2a05a0a2bbefdac50ae Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 13:06:52 +0900
Subject: [PATCH] 이슈 조회 쿼리(find) 한개로 합침
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 38 ++++++++++++++++++++++++++++----------
src/main/resources/mybatis/query-template/issue-template.xml | 14 ++++++++++++--
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 0a7bb23..ddedab6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -12,6 +12,7 @@
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.domain.enumType.IssueStatusType;
import kr.wisestone.owl.exception.OwlRuntimeException;
+import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.mapper.IssueMapper;
import kr.wisestone.owl.mapper.ProjectMapper;
import kr.wisestone.owl.repository.IssueRelationRepository;
@@ -175,6 +176,9 @@
@Autowired
private UserDepartmentRepository userDepartmentRepository;
+
+ @Autowired
+ private DepartmentMapper departmentMapper;
@Autowired
private WorkflowDepartmentRepository workflowDepartmentRepository;
@@ -692,8 +696,22 @@
for(UserDepartment myDepartment : myDepartments){
myDepartmentIds.add(myDepartment.getDepartmentId());
}
+ } else {
+ myDepartmentIds.add(-1L);
}
issueCondition.setMyDepartmentIds(myDepartmentIds);
+ }
+
+ void SetAllDepartmentId(IssueCondition issueCondition){
+ List<Long> departmentIds = Lists.newArrayList();
+ List<Map<String, Object>> departmentList = this.departmentMapper.find(null);
+
+ if(departmentList != null && departmentList.size() > 0){
+ for(Map<String, Object> department : departmentList){
+ departmentIds.add((Long) department.get("id"));
+ }
+ }
+ issueCondition.setMyDepartmentIds(departmentIds);
}
void SetWorkflowDepartment(List<IssueVo> issueVos){
@@ -752,16 +770,16 @@
Long totalCount = 0L;
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
-// if (this.userWorkspaceService.checkWorkspaceManager(user)
-// || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
- results = this.issueMapper.find(issueCondition);
- totalCount = this.issueMapper.count(issueCondition);
-// }
-// } else{
-// this.SetMyDepartmentId(issueCondition);
-// results = this.issueMapper.findByDepartment(issueCondition);
-// totalCount = this.issueMapper.countByDepartment(issueCondition);
-// }
+ if (this.userWorkspaceService.checkWorkspaceManager(user)
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ this.SetAllDepartmentId(issueCondition);
+ } else{
+ this.SetMyDepartmentId(issueCondition);
+ /*results = this.issueMapper.findByDepartment(issueCondition);
+ totalCount = this.issueMapper.countByDepartment(issueCondition);*/
+ }
+ results = this.issueMapper.find(issueCondition);
+ totalCount = this.issueMapper.count(issueCondition);
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 6e07ef3..5c3a3c7 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -45,6 +45,7 @@
LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
LEFT OUTER JOIN issue_department isd FORCE INDEX(issueIdIndex) ON issue.id = isd.issue_id
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
+ LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
temp_attached_file on (temp_attached_file.issue_id = issue.id)
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
@@ -172,6 +173,15 @@
</choose>
<choose>
+ <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND isd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
<when test="registerIds.size != 0">
AND issue.register_id IN
<foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
@@ -208,7 +218,7 @@
</if>
</select>
- <select id="findByDepartment" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
+ <!--<select id="findByDepartment" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
DISTINCT issue.id as id,
issue.register_id as registerId,
@@ -401,7 +411,7 @@
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
- </select>
+ </select>-->
<!--<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
--
Gitblit v1.8.0