From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index fecfa44..9b8457e 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -32,7 +32,7 @@
join
manage_role_menu mrm
on
- mm.`id` = mrm.`menu_id` and mrm.`is_delete`=0
+ mm.`id` = mrm.`menu_id` and mrm.`is_delete`= '0'
join
manage_role mr
on
@@ -41,7 +41,7 @@
#{role.id}
</foreach>
where
- mm.`is_delete`=0
+ mm.`is_delete`= '0'
</select>
<select id="getManageMenuByName" resultMap="BaseResultMap">
--
Gitblit v1.8.0