From e1f565069628c8c136b9a84c461f7ffc7f4f8459 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 29 May 2019 19:31:40 +0800
Subject: [PATCH] =?UTF-8?q?area=20=E6=8E=A7=E5=88=B6=E5=99=A8=20treeData?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20parentCode=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BDtree=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/sys/web/AreaController.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
index 5b6d347f..273bd432 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
@@ -186,9 +186,16 @@ public class AreaController extends BaseController {
 	@RequiresPermissions("user")
 	@RequestMapping(value = "treeData")
 	@ResponseBody
-	public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) {
+	public List<Map<String, Object>> treeData(String excludeCode, String isShowCode, String parentCode) {
 		List<Map<String, Object>> mapList = ListUtils.newArrayList();
-		List<Area> list = AreaUtils.getAreaAllList();
+		List<Area> list = null;
+		if (StringUtils.isNotBlank(parentCode)){
+			Area where = new Area();
+			where.setParentCode(parentCode);
+			list = areaService.findList(where);
+		}else{
+			list = AreaUtils.getAreaAllList();
+		}
 		for (int i=0; i<list.size(); i++){
 			Area e = list.get(i);
 			// 过滤非正常的数据
@@ -208,6 +215,7 @@ public class AreaController extends BaseController {
 			map.put("id", e.getId());
 			map.put("pId", e.getParentCode());
 			map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getId(), e.getAreaName()));
+			map.put("isParent", !e.getIsTreeLeaf());
 			mapList.add(map);
 		}
 		return mapList;