From 2c273d1072424a9363314fb258265cbf487f0297 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 16 12월 2021 17:48:46 +0900 Subject: [PATCH] - Excel Import 기능 담당부서도 들어가게 하기(기간 미지정 시에도 가능하도록 수정) - 이슈 통합검색 키워드에 업체,ISP,호스팅 정보도 포함 - 프로젝트에서 설정한 이슈유형만 보여주기 --- src/main/resources/mybatis/query-template/department-template.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml index 98aaf4d..9b97cbb 100644 --- a/src/main/resources/mybatis/query-template/department-template.xml +++ b/src/main/resources/mybatis/query-template/department-template.xml @@ -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> @@ -49,6 +57,23 @@ <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> -- Gitblit v1.8.0