From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
index 4285d5c..b307625 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
@@ -5,12 +5,8 @@
<mapper namespace="com.example.erp.mapper.userInfo.PermissionBasicMapper">
<select id="getPermission">
select a.id,
- <if test="lang=='en'">
a.menu,
- </if>
- <if test="lang=='zh'">
- c.itemName as menu,
- </if>
+
a.page,
a.permission,
a.state,
@@ -19,10 +15,6 @@
left join permission_role as b
on b.permission_id = a.id
and b.role_id = #{roleId}
- <if test="lang=='zh'">
- left join sys_menu_item as c
- on c.menu = a.menu
- </if>
where a.id!=1 and a.state=1
<if test="id != null and id != ''">
@@ -33,12 +25,7 @@
<select id="selectOneLevel">
select a.id,
- <if test="lang=='zh'">
- b.itemName as menu
- </if>
- <if test="lang=='en'">
a.menu
- </if>
from permission_basic as a
left join sys_menu_item as b
on a.menu = b.menu
--
Gitblit v1.8.0