From 9ec408b3af999882b15f7ca58dd3e0a6746a82ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Tue, 17 Oct 2023 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3=E5=A4=A7?=
=?UTF-8?q?=E5=8E=85=E7=AB=99=E7=82=B9=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../area/service/impl/AreaServiceImpl.java | 22 +++++++++----------
.../com/mortals/httpclient/system/system.http | 10 +++++++--
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java
index 575a0ef6..63d81e51 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java
@@ -170,23 +170,23 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
*/
@Override
public List<AreaTreeSelect> buildCustomAreaTreeSelect(List<AreaEntity> areaList) {
- List<AreaEntity> returnList = new ArrayList<>();
-
- List<AreaEntity> list = this.find(new AreaQuery());
+ List<AreaTreeSelect> returnList = new ArrayList<>();
List<Long> tempList = areaList.stream().map(AreaEntity::getId).collect(Collectors.toList());
- for (AreaEntity areaEntity : list) {
+ for (AreaEntity areaEntity : areaList) {
// 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
if (!tempList.contains(areaEntity.getPid())) {
- recursionFn(list, areaEntity);
- returnList.add(areaEntity);
+ //recursionFn(list, areaEntity);
+ List<AreaTreeSelect> listTree = getListByRootId(areaEntity.getIid(), null);
+ AreaTreeSelect areaTreeSelect = new AreaTreeSelect(areaEntity);
+ areaTreeSelect.setChildren(listTree);
+ // areaEntity.setChildren();
+ returnList.add(areaTreeSelect);
}
}
- if (returnList.isEmpty()) {
- returnList = list;
- }
- return returnList.stream().map(AreaTreeSelect::new).collect(Collectors.toList());
+
+ return returnList;
}
@Override
@@ -306,7 +306,7 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
@Override
public Rest<String> removeAll() {
HashMap condition = new HashMap();
- condition.put("1",1);
+ condition.put("1", 1);
int delete = this.dao.delete(condition);
//鍒犻櫎鎵€鏈夌紦瀛樻暟鎹�
this.removeAllCache();
diff --git a/base-manager/src/test/java/com/mortals/httpclient/system/system.http b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
index 84c93717..4d30d49e 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/system/system.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
@@ -6,7 +6,7 @@ Content-Type: application/json
{
"loginName":"banana",
"password":"gxjG123!@#",
- "securityCode":"8888"
+ "securityCode":"admin"
}
> {%
@@ -17,7 +17,13 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
###鏋勫缓绔欑偣鏍�
POST {{baseUrl}}/area/authAreaTree
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwNjY6MThhNmEyOGM0ZDNhNGQ3OTgyYjlhOWFlYjU0MDU3MTAifQ.Ex92WgtbmsV6EBONj5SO48iG7oy4l6imsIcNK-qtJUw
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###鏋勫缓绔欑偣鏍�
+POST {{baseUrl}}/area/treeselect
+Authorization: {{authToken}}
Accept: application/json
--
2.24.3