From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/resources/mybatis/query-template/userLevel-template.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/userLevel-template.xml b/src/main/resources/mybatis/query-template/userLevel-template.xml
index 61ede06..9a1659a 100644
--- a/src/main/resources/mybatis/query-template/userLevel-template.xml
+++ b/src/main/resources/mybatis/query-template/userLevel-template.xml
@@ -10,11 +10,16 @@
ul.permission as permission
FROM
user_level ul
- WHERE 1=1
+ WHERE id != 1 AND 1=1
<if test="levelName != '' and levelName != null">
AND ul.level_name like CONCAT('%',#{levelName},'%')
</if>
- limit #{pageSize} offset #{page};
+ <if test="id != '' and id != null">
+ AND ul.id like CONCAT('%',#{id},'%')
+ </if>
+ <if test="pageSize != '' and pageSize != null">
+ limit #{pageSize} offset #{page};
+ </if>
</select>
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.UserLevelCondition">
--
Gitblit v1.8.0