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/issueType-template.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml index 8beb810..b26e4d5 100644 --- a/src/main/resources/mybatis/query-template/issueType-template.xml +++ b/src/main/resources/mybatis/query-template/issueType-template.xml @@ -8,7 +8,9 @@ DISTINCT it.id as id, it.name as name, it.description as description, - it.color as color + it.color as color, + it.project_id as projectId, + it.complete_issue_status_id as completeIssueStatusId FROM issue_type it INNER JOIN workspace ws on it.workspace_id = ws.id @@ -16,6 +18,12 @@ <if test="name != '' and name != null"> AND it.name like CONCAT('%',#{name},'%') </if> + <if test="projectId != '' and projectId != null"> + AND it.project_id like CONCAT('%',#{projectId},'%') + </if> + <if test="useProject != '' and useProject != null and useProject == true"> + AND it.project_id IS NOT NULL + </if> AND ws.id = #{workspaceId} <if test="page != null and !page.equals('')"> limit #{pageSize} offset #{page}; -- Gitblit v1.8.0