From c0e0761eec99d3642b6a1acdcdb5e2b51a481aaf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 11 Dec 2024 20:49:28 +0800
Subject: [PATCH] 权限配置

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
index 15fccb8..25f90c8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
@@ -48,6 +48,7 @@
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -210,12 +211,18 @@
 	@ApiOperation(value = "获取单位树形结构", notes = "获取单位树形结构")
 	public R<Map<String,List<DeptVO>>> getDwByParentId(String precinct) {
 		Map<String,List<DeptVO>> map=new HashMap<>();
-		List<DeptVO> tree1 = deptService.treeByParentIdNew("1821370772215062530",precinct);
-		List<DeptVO> tree2 = deptService.treeByParentIdNew("1821370871330660353",precinct);
-		List<DeptVO> tree3 = deptService.treeByParentIdNew("1806175841028685826",precinct);
-		map.put("one",tree1);
-		map.put("two",tree2);
-		map.put("three",tree3);
+		if(precinct==null||precinct.equals("")){
+			map.put("one",new ArrayList<>());
+			map.put("two",new ArrayList<>());
+			map.put("three",new ArrayList<>());
+		}else {
+			List<DeptVO> tree1 = deptService.treeByParentIdNew("1821370772215062530", precinct);
+			List<DeptVO> tree2 = deptService.treeByParentIdNew("1821370871330660353", precinct);
+			List<DeptVO> tree3 = deptService.treeByParentIdNew("1806175841028685826", precinct);
+			map.put("one", tree1);
+			map.put("two", tree2);
+			map.put("three", tree3);
+		}
 		return R.data(map);
 	}
 }

--
Gitblit v1.9.3