From aece48b253b2e0b814bbdf5ee3d474e8cf697122 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
index 0f30a4b..f980401 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
@@ -38,15 +38,14 @@
on b.id = c.role_id
left join permission_basic d
on d.id = c.permission_id
- and d.permission='edit'
- where a.id = #{loginId}
+ where a.id = #{loginId} and
</if>
<if test="userIsAdmin==true">
from permission_basic d
- where d.permission='edit'
+ where
</if>
- and d.state = 1
+ d.state = 1
group by d.id
</select>
--
Gitblit v1.8.0