From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 화, 15 3월 2022 12:12:17 +0900 Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가 --- src/main/resources/mybatis/query-template/userWorkspace-template.xml | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml index ffaeea5..93d56a1 100644 --- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml +++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml @@ -10,7 +10,7 @@ u.name as userName, u.account as account, u.level_id as levelId, - u.department_id as departmentId, + uw.manager_yn as managerYn, CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn FROM user_workspace uw @@ -18,7 +18,6 @@ INNER JOIN workspace w on uw.workspace_id = w.id WHERE 1=1 AND w.id = #{workspaceId} - AND uw.manager_yn = 'N' <if test="name != '' and name != null"> AND u.name like CONCAT('%',#{name},'%') </if> @@ -44,16 +43,6 @@ </foreach> </when> </choose> - - <choose> - <when test="departmentIds.size != 0"> - AND u.department_id IN - <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")"> - #{item} - </foreach> - </when> - </choose> - limit #{pageSize} offset #{page}; </select> @@ -69,7 +58,6 @@ INNER JOIN workspace w on uw.workspace_id = w.id WHERE 1=1 AND w.id = #{workspaceId} - AND uw.manager_yn = 'N' <if test="name != '' and name != null"> AND u.name like CONCAT('%',#{name},'%') </if> -- Gitblit v1.8.0