From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/resources/mappers/SystemPermissionMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml b/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
index 5fe7f06..d584db7 100644
--- a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
@@ -30,6 +30,15 @@
<if test="dto.type != null">
AND ifnull(perm.type,0) in(0, ${dto.type})
</if>
+ <if test="dto.iscom != null">
+ AND ifnull(perm.iscom,0) =${dto.iscom}
+ </if>
+ <if test="dto.isshop != null">
+ AND ifnull(perm.isshop,0)=${dto.isshop}
+ </if>
+ <if test="dto.isadmin != null">
+ AND ifnull(perm.isadmin,0) = ${dto.isadmin}
+ </if>
<if test="dto.name != null and dto.name!=''">
AND perm.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
</if>
--
Gitblit v1.9.3