From d17082e252aec4794f322db2b402feae1e0eec3d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 30 Jun 2023 10:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml | 10 +++++++---
 .../portal/biz/sysmenurole/SysMenuRoleService.java     |  5 -----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml
index 5fda000c5b..3a06198e72 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml
@@ -44,9 +44,13 @@
     </select>
 
     <select id="selMenuByRole" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDataVo">
-        SELECT smr.sid,sm.`name`,smr.`dataRuleId`
-        FROM sys_menu_role smr
-        LEFT JOIN sys_menu sm
+        SELECT
+        smr.sid,
+        sm.`name`,
+        smr.`dataRuleId`
+        FROM
+        sys_menu sm
+        LEFT JOIN sys_menu_role smr
         ON smr.`menuSid` = sm.`sid`
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
index ff3db31ac3..beb688f30e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
@@ -173,11 +173,6 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
             qw.like("sm.name",query.getMenuName());
         }
         List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
-        for (SysMenuRoleDataVo sysMenuRoleDataVo : sysMenuRoleDataVos) {
-            if (StringUtils.isBlank(sysMenuRoleDataVo.getName())){
-                sysMenuRoleDataVos.remove(sysMenuRoleDataVo);
-            }
-        }
         return rb.success().setData(sysMenuRoleDataVos);
     }