Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -57,6 +57,24 @@ public class SysDeptController extends BaseController {
         return success(depts);
     }
 
+    /**
+     * 获取部门列表,
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:listAll')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptListAll(dept);
+        for (SysDept sysDept : depts) {
+            for (SysDept dept1 : depts) {
+                if (dept1.getDeptId().equals(sysDept.getParentId())) {
+                    sysDept.setParentName(dept1.getDeptName());
+                    break;
+                }
+            }
+        }
+        return success(depts);
+    }
+
     /**
      * 获取部门树列表
      */
@@ -145,7 +163,7 @@ public class SysDeptController extends BaseController {
     @PostMapping("/export")
     @ApiOperation("部门管理")
     public void export(HttpServletResponse response, SysDept dept) {
-        List<SysDept> list = deptService.selectDeptList(dept);
+        List<SysDept> list = deptService.selectDeptListAll(dept);
         ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
         util.exportExcel(response, list, "角色数据");
     }

hazard-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -144,6 +144,14 @@ public class SysMenuController extends BaseController {
     public void export(HttpServletResponse response, SysMenu menu) {
         LoginUser loginUser = getLoginUser();
         List<SysMenu> list = menuService.selectMenuList(menu, loginUser.getId());
+        for (SysMenu menuA : list) {
+            for (SysMenu menu1 : list) {
+                if (menu1.getMenuId().compareTo(menuA.getParentId()) == 0) {
+                    menuA.setParentName(menu1.getMenuName());
+                    break;
+                }
+            }
+        }
         ExcelUtil<SysMenu> util = new ExcelUtil<SysMenu>(SysMenu.class);
         util.exportExcel(response, list, "角色数据");
     }