From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/department-template.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index 9b97cbb..169e31b 100644
--- a/src/main/resources/mybatis/query-template/department-template.xml
+++ b/src/main/resources/mybatis/query-template/department-template.xml
@@ -12,10 +12,10 @@
FROM
department d
WHERE 1=1
- <if test="departmentName != '' and departmentName != null">
+ <if test="departmentName != null and departmentName != ''">
AND d.department_name like CONCAT('%',#{departmentName},'%')
</if>
- <if test="id != '' and id != null">
+ <if test="id != null and id != ''">
AND d.id like CONCAT('%',#{id},'%')
</if>
<choose>
@@ -76,5 +76,29 @@
where p.id = #{projectId};
</select>
+ <select id="findByIssueStatusId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.DepartmentCondition">
+ SELECT
+ d.id as id,
+ d.department_name as departmentName
+ FROM
+ department d
+ INNER JOIN workflow_department wd ON wd.department_id = d.id
+ WHERE 1=1
+ <if test="issueStatusId != null and issueStatusId != ''">
+ AND wd.issue_status_id = #{issueStatusId}
+ </if>
+ <if test="workflowId != null and workflowId != ''">
+ AND wd.workflow_Id = #{workflowId}
+ </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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0