From c87e44fb1a97619711d84eecba0136f1ec88b95c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:27:06 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 7b87026..fee4da7 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
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.NumberUtil;
+import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,26 +62,28 @@
@Override
public R addExpert(ComSanshuoExpertDTO comSanshuoExpertDTO) {
//是否重名
- ComSanshuoExpert checkExpert=comSanshuoExpertDao.selectExpertByNameOrPhoneOrAccount(comSanshuoExpertDTO);
- if (nonNull(checkExpert)){
+ List<ComSanshuoExpert> checkExpert=comSanshuoExpertDao.selectExpertByNameOrPhoneOrAccount(comSanshuoExpertDTO);
+ if (checkExpert.size() != 0){
return R.fail("账号信息有重复");
}
ComSanshuoExpert expert=new ComSanshuoExpert();
BeanUtil.copyProperties(comSanshuoExpertDTO,expert);
- //处理id
if (nonNull(comSanshuoExpertDTO.getUnit())){
String id = comSanshuoExpertDTO.getUnit();
String[] split = id.split(",");
- comSanshuoExpertDTO.setUnitId(split[split.length-1]);
+ expert.setUnitId(split[split.length-1]);
}
expert.setId(Snowflake.getId());
expert.setCreateTime(new Date());
if (expert.getLevel()==2){
expert.setIndustryCenterId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==3){
expert.setStreetId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
}
expert.setStatus(1);
expert.setDelFlag(1);
@@ -183,15 +186,19 @@
vo.setLevel(i);
if (i==2){
//设置行业分中心为childList
+ vo.setId(2L);
vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
vo.setName("行业分中心");
}else if (i==3){
+ vo.setId(3L);
vo.setChildList(comSanshuoIndustryCenterDao.streetList());
vo.setName("街道调解站");
}else if (i==4){
+ vo.setId(4L);
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
vo.setName("社区调解站");
}else if(i==1){
+ vo.setId(1L);
vo.setName("三说会堂");
}
list.add(vo);
--
Gitblit v1.7.1