czh 2 лет назад
Родитель
Сommit
68e2a37c49
1 измененных файлов с 5 добавлено и 10 удалено
  1. 5 10
      sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

+ 5 - 10
sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -273,14 +273,9 @@
       <if test="systemType != 1 and clientType != 3">
         and smr.del_flag = 0
       </if>
-      <choose>
-        <when test="clientType == 3">
-          and sm.client_type = 2
-        </when>
-        <otherwise>
-          and sm.client_type = #{clientType}
-        </otherwise>
-      </choose>
+    <if test="clientType != null">
+      and sm.client_type = #{clientType}
+    </if>
     <if test="name != null and name != ''">
       and sm.name = #{name, jdbcType=VARCHAR}
     </if>
@@ -290,11 +285,11 @@
           using_roles like concat('%', #{item}, '%')
         </foreach>
       </if>
-    <if test="entId != null">
+    <if test="entId != null and clientType != 3">
       and smr.ent_id = #{entId}
       and smr.role_id is null
     </if>
-    <if test="roleIds != null and roleIds.size() > 0">
+    <if test="roleIds != null and roleIds.size() > 0 and clientType != 3">
       and smr.role_id in
       <foreach collection="roleIds" separator="," open="(" close=")" item="item">
         #{item}