From c216ba116f2d82cdb8861f393b266a32da6824ec Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 27 九月 2022 14:57:56 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 b23b06c..bb79c75 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
@@ -66,7 +66,7 @@
if (nonNull(comSanshuoExpertDTO.getUnit())){
String id = comSanshuoExpertDTO.getUnit();
String[] split = id.split(",");
- comSanshuoExpertDTO.setUnitId(split[split.length]);
+ comSanshuoExpertDTO.setUnitId(split[split.length-1]);
}
expert.setId(Snowflake.getId());
expert.setCreateTime(new Date());
@@ -77,6 +77,8 @@
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
}
+ expert.setStatus(1);
+ expert.setDelFlag(1);
int insert = comSanshuoExpertDao.insert(expert);
if (insert>0){
try {
@@ -173,10 +175,15 @@
if (i==2){
//设置行业分中心为childList
vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
+ vo.setName("行业分中心");
}else if (i==3){
vo.setChildList(comSanshuoIndustryCenterDao.streetList());
+ vo.setName("街道调解站");
}else if (i==4){
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
+ vo.setName("社区调解站");
+ }else if(i==1){
+ vo.setName("三说话会堂");
}
list.add(vo);
}
--
Gitblit v1.7.1