From a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 05 11월 2021 10:51:38 +0900 Subject: [PATCH] 부서관리 테이블 변경 및 언어팩 수정 --- src/main/resources/mybatis/query-template/userWorkspace-template.xml | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml index cde0860..ffaeea5 100644 --- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml +++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml @@ -9,9 +9,8 @@ u.id as userId, u.name as userName, u.account as account, - u.levelName as levelName, - u.departmentName as departmentName, - /*u.permission as permission,*/ + u.level_id as levelId, + u.department_id as departmentId, CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn FROM user_workspace uw @@ -36,6 +35,25 @@ </foreach> </when> </choose> + + <choose> + <when test="levelIds.size != 0"> + AND u.level_id IN + <foreach collection="levelIds" item="item" index="index" separator="," open="(" close=")"> + #{item} + </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> -- Gitblit v1.8.0