From 2fed2749b65c7926ab20fc45a830f5d84adaff41 Mon Sep 17 00:00:00 2001 From: jinhyuk jang <imlovee@naver.com> Date: 일, 12 12월 2021 23:22:00 +0900 Subject: [PATCH] - 일반 사용자 로그인시 이슈유형 메뉴 정상적으로 뜨도록 수정 - 이슈 메뉴 클릭시 프로젝트에 속해 있는 사용자는 모든 이슈 보도록 수정 --- 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