From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示

---
 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml |   11 +++++------
 1 files changed, 5 insertions(+), 6 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..f980401 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
@@ -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="loginId==1">
+        <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