From f557cd3c7c1d981e23ed6b8220c8d8c4906a7e27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 19:30:47 +0900
Subject: [PATCH] - 사용자 필드 기능 수정 - 이슈 추가/수정시 워크플로우에 설정된 담당부서로 변경되도록 수정 * DB 초기화 필요
---
src/main/resources/mybatis/query-template/department-template.xml | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index fa372ac..9b97cbb 100644
--- a/src/main/resources/mybatis/query-template/department-template.xml
+++ b/src/main/resources/mybatis/query-template/department-template.xml
@@ -8,7 +8,7 @@
d.id as id,
d.department_name as departmentName,
d.department_description as departmentDescription,
- (SELECT COUNT(d.id) FROM user u WHERE d.id = u.id) AS departmentCount
+ (SELECT COUNT(ud.department_id) FROM user_department ud WHERE d.id = ud.department_id) AS departmentCount
FROM
department d
WHERE 1=1
@@ -18,6 +18,14 @@
<if test="id != '' and id != null">
AND d.id like CONCAT('%',#{id},'%')
</if>
+ <choose>
+ <when test="excludeIds != null and excludeIds.size != 0">
+ AND d.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
@@ -36,4 +44,37 @@
AND d.id like CONCAT('%',#{id},'%')
</if>
</select>
+
+ <select id="findByDepartmentIds" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.UserCondition">
+ SELECT
+ d.id as id,
+ d.department_name as departmentName,
+ d.department_description as departmentDescription
+ FROM
+ user_department ud
+ INNER JOIN department d ON ud.department_id = d.id
+ WHERE 1=1
+ <if test="id != '' and id != null">
+ AND ud.user_id = #{id}
+ </if>
+ <choose>
+ <when test="excludeIds != null and excludeIds.size != 0">
+ AND d.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>
+
+ <select id="findProjectDepartment" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.UserCondition">
+ select DISTINCT (d.id) as departmentId, d.department_name as departmentName from department d
+ inner join project_role_department prd on prd.department_id = d.id
+ inner join project_role pr on pr.id = prd.project_role_id
+ inner join project p on p.id = pr.project_id
+ where p.id = #{projectId};
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0