合并

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -54,19 +54,19 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
 
-            // 查询按钮
-            QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
-            taRoleButtonQuery.eq("role_id",id);
-            List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
-            List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
-            for(TaRoleButton taRoleButton :taRoleButtonList){
-                QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-                sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
-                SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
-                sysButtonInArr.add(sysButtonInMenuList);
-            }
-            sysMenu.setSysButtonInMenu(sysButtonInArr);
         }
+        // 查询按钮
+        QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+        taRoleButtonQuery.eq("role_id",id);
+        List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+        List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+        for(TaRoleButton taRoleButton :taRoleButtonList){
+            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+            sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+            SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+            sysButtonInArr.add(sysButtonInMenuList);
+        }
+        taRole.setSysButtonInMenu(sysButtonInArr);
         taRole.setSysMenuList(sysMenuList);
         return taRole;
     }