From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 b81ac2b..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
@@ -234,7 +234,7 @@
expertShowVO.setChildList(expertShowVOS1);
}else {
expertShowVO.setName("村/社区调解站调解专家");
- List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity();
+ List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity(appId);
expertShowVO.setChildList(expertShowVOS1);
}
}
@@ -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);
@@ -349,15 +349,26 @@
* 专家风采列表
* */
@Override
- public R expertShowList(Integer level, Long id) {
+ public R expertShowList(Integer level, Long id,String appId) {
QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
- wrapper.eq("level",level );
- 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