From 1b960584383766692a257a4cdd92daf19bab172d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 27 12월 2021 09:32:50 +0900
Subject: [PATCH] - API 추가/수정시 사용자 정의 필드 항목이 없을 경우 오류 처리 - API 에서 도메인만 추출하여 같은 도메인을 갖는 업체/isp/hosting 자동 입력하도록 수정
---
src/main/resources/mybatis/query-template/department-template.xml | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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 95989ae..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>
@@ -67,5 +67,38 @@
</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>
+
+ <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