learshaw hai 4 meses
pai
achega
5ae345bb9d

+ 10 - 2
ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AreaController.java

@@ -108,8 +108,16 @@ public class AreaController extends BaseController {
     @GetMapping(value = "/getAreaTree")
     public AjaxResult getAreaTree(@RequestParam(name = "rootCode") String rootCode,
         @RequestParam(name = "layer", required = false) Integer layer) {
-        List<Area> areas = areaService.selectAreaTree(rootCode, null == layer || layer > 1);
-        List<TreeEntity> ret = AreaUtils.convertAreaTree(areas);
+        List<TreeEntity> ret = null;
+
+        if (null == layer) {
+            List<Area> areas = areaService.selectAreaTree(rootCode, true);
+            ret = AreaUtils.convertAreaTree(areas);
+        }
+        else {
+            List<Area> areas = areaService.selectAreaTree(rootCode, layer > 1);
+            ret = AreaUtils.convertAreaTree(areas, layer);
+        }
         return success(ret);
     }