问题处理

hx-base/src/main/java/com/fjhx/base/system/SysMenuController.java

@@ -111,12 +111,12 @@ public class SysMenuController extends BaseController {
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId) {
-//        if (menuService.hasChildByMenuId(menuId)) {
-//            return warn("存在子菜单,不允许删除");
-//        }
-//        if (menuService.checkMenuExistRole(menuId)) {
-//            return warn("菜单已分配,不允许删除");
-//        }
+        if (menuService.hasChildByMenuId(menuId)) {
+            return warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId)) {
+            return warn("菜单已分配,不允许删除");
+        }
         return toAjax(menuService.deleteMenuById(menuId));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -117,6 +117,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 }
                 deptId = sysDept.getParentId();
             }
+            //递归完数据是反的翻转一下
+            Collections.reverse(deptNameList);
             sysUser.setDeptNameList(deptNameList);
         }