From 7fc1daa8a0de3395ad4486d598ee1993fa0ac68d Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 23 十一月 2022 10:56:59 +0800
Subject: [PATCH] 三说会堂修改社区范围，筛选
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index ec55a20..b8f32e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -266,7 +266,7 @@
}else if (i==4){
vo.setId(4L);
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
- vo.setName("社区调解站");
+ vo.setName("社区调解室");
}else if(i==1){
vo.setId(1L);
vo.setName("三说会堂");
@@ -297,7 +297,7 @@
List<ExpertRangeVO> list = new ArrayList<>();
ExpertRangeVO vo = new ExpertRangeVO();
vo.setLevel(4);
- vo.setName(comStreetDO.getName() + "调解站");
+ vo.setName(comStreetDO.getName() + "调解室");
vo.setId(loginUserInfo.getCommunityId());
list.add(vo);
return R.ok(list);
@@ -351,16 +351,24 @@
@Override
public R expertShowList(Integer level, Long id,String appId) {
QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
- wrapper.eq("level",level);
- wrapper.eq("app_id",appId);
- wrapper.eq("status",1 );
- wrapper.eq("del_flag",1 );
- if (level.equals(2)){
- wrapper.eq("industry_center_id", id);
- }else if (level.equals(3)){
- wrapper.eq("street_id",id );
- }else if (level.equals(4)){
- wrapper.eq("community_id",id );
+ if (level==0){
+ wrapper.eq("app_id",appId );
+ }else {
+ if (level!=7){
+ wrapper.eq("level",level);
+ wrapper.eq("app_id",appId);
+ wrapper.eq("status",1 );
+ wrapper.eq("del_flag",1 );
+ if (level.equals(2)){
+ wrapper.eq("industry_center_id", id);
+ }else if (level.equals(3)){
+ wrapper.eq("street_id",id );
+ }else if (level.equals(4)){
+ wrapper.eq("community_id",id );
+ }
+ }else {
+ wrapper.eq("id",id );
+ }
}
List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {
--
Gitblit v1.7.1