From 2ccdf3184f80a49284b1137230e17189fa3ff965 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 18 七月 2022 18:01:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 9518fa7..38eea50 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3482,7 +3482,6 @@
return R.ok(userRate);
}
-
@Override
public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
@@ -3602,7 +3601,6 @@
}
return R.ok();
}
-
@Override
public R getCommunityList(Integer type) {
List<Integer> areaList = areaCodeList();
@@ -3617,8 +3615,10 @@
StreetVO vo = iterator.next();
List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), type);
vo.setCommunityList(communityVOS);
- if (communityVOS==null || communityVOS.size()==0){
- iterator.remove();
+ if (type!=3){
+ if (communityVOS==null || communityVOS.size()==0){
+ iterator.remove();
+ }
}
}
List<StreetVOS> list=new ArrayList<>();
@@ -3648,6 +3648,7 @@
}
return R.ok(areaVOList);
}
+
/**
* 获取最近20天数据
@@ -3774,6 +3775,9 @@
case "510422":
name="盐边县";
break;
+ case "510424":
+ name="钒钛新区";
+ break;
}
return name;
}
@@ -3814,11 +3818,12 @@
* */
private List<Integer> areaCodeList(){
List<Integer> list=new ArrayList<>();
- list.add(510423);
list.add(510402);
+ list.add(510423);
list.add(510411);
list.add(510421);
list.add(510422);
+ list.add(510424);
return list;
}
--
Gitblit v1.7.1