From 3da71368d451c455872a6ca114c0540e65308aef Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 28 12월 2021 15:32:43 +0900 Subject: [PATCH] 공지사항,Faq,가이드,Qna 통합 수정 - 일반회원은 faq,가이드 활성화 된 게시글만 보이기 - 엑셀다운,삭제 기능 추가(기존에 없었음) - 삭제,수정 시 권한 체크 --- 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