From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java
index 544ad09..b7e0346 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java
@@ -94,7 +94,7 @@
@GetMapping("/areaTownCommunity")
public R test(@RequestParam("name")String name,@RequestParam("userId")Long userId){
- Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L};
+ Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L,89234L};
if("panzhihua".equals(name)){
List<ComAreaCounty> list=comAreaTownCommunityDao.selectArea();
list.forEach(lis->{
@@ -107,6 +107,11 @@
else {
list1=comAreaTownCommunityDao.selectCommunity(tow.getValue(),"");
}
+ if("大渡口街道".equals(tow.getValue())){
+ ComAreaCounty comAreaCounty=list1.get(0);
+ list1.remove(0);
+ list1.add(2,comAreaCounty);
+ }
tow.setChildren(list1);
});
lis.setChildren(townList);
--
Gitblit v1.7.1