From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index de48d21..033a2f9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -78,7 +78,7 @@
@GetMapping(path = "all")
@SsoAop()
public BaseResponse<List<BaDistrict>> all() {
- List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code);
+ List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.Province.code);
return BaseResponseUtils.buildSuccess(list);
}
@@ -297,6 +297,7 @@
List<Map<String, Object>> list_towns = Optional.ofNullable(sv.getDistrictsBySupperId(countyId)).orElse(new ArrayList<>());
if (list_towns.size() > 0) {
array_towns = JSONArray.parseArray(JSON.toJSONString(list_towns));
+ job_county.put("children", array_towns);
// 閬嶅巻姣忎竴涓晣锛屽皢闀囦笅鏉戝垪琛ㄥ姞鍒伴晣鐨勫瓙闆�
for (int j = 0; j < array_towns.size(); j++) {
JSONObject job_town = array_towns.getJSONObject(j);
@@ -310,7 +311,7 @@
//System.out.println("----" + array_towns);
}
// 闀囨潙缁勮瀹屾瘯锛屽皢闀囨潙鍔犲埌鍘夸笅
- job_county.put("children", array_towns);
+// job_county.put("children", array_towns);
}
// 鍘跨粍瑁呭畬姣�
//String a = array_counties.toJSONString();
--
Gitblit v1.8.0