Browse Source

部门、菜单根据条件导出

wyyay 1 year ago
parent
commit
5f0bf7d15f

+ 2 - 2
.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="base-admin" />
+        <module name="hazard-admin" />
         <module name="hazard-sdk" />
         <module name="business-service" />
-        <module name="hazard-admin" />
-        <module name="base-admin" />
       </profile>
     </annotationProcessing>
   </component>

+ 12 - 12
.idea/jarRepositories.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
     <remote-repository>
@@ -11,6 +11,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
@@ -26,11 +36,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -41,10 +46,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
   </component>
 </project>

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

@@ -175,10 +175,14 @@ public class SysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     @ApiOperation("部门导出")
-    public void export(HttpServletResponse response, SysDept dept) {
-        List<SysDept> list = forDeptList(dept);
+    public void export(HttpServletResponse response, @RequestBody SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptListAll(dept);
+        for (SysDept sysDept : depts) {
+            SysDept current= deptService.selectDeptById(sysDept.getParentId());
+            sysDept.setParentName(current.getDeptName());
+        }
         ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
-        util.exportExcel(response, list, "部门数据");
+        util.exportExcel(response, depts, "部门数据");
     }
 
     /**

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

@@ -141,7 +141,7 @@ public class SysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:export')")
     @PostMapping("/export")
     @ApiOperation("菜单导出")
-    public void export(HttpServletResponse response, SysMenu menu) {
+    public void export(HttpServletResponse response, @RequestBody SysMenu menu) {
         LoginUser loginUser = getLoginUser();
         List<SysMenu> list = menuService.selectMenuList(menu, loginUser.getId());
         for (SysMenu menuA : list) {