From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 9625f33..0f30a4b 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml
@@ -28,7 +28,7 @@
                     if(d.page=null || d.page='','',concat(d.page, '.')),
                     d.permission
                 ) as 'permission'
-        <if test="loginId!=1">
+        <if test="userIsAdmin==false">
         from user as a
                  left join user_role as e
                            on e.user_id = a.id
@@ -42,7 +42,7 @@
         where a.id = #{loginId}
 
         </if>
-        <if test="loginId==1">
+        <if test="userIsAdmin==true">
             from permission_basic d
             where d.permission='edit'
         </if>

--
Gitblit v1.8.0