From b2a64967d13f68175cd0c47f1a5b6169c42ed8a9 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 16:21:30 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
index b25f691..6ce956d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -9,8 +9,10 @@
 import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
 import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.service_community.entity.ComEvent;
 import com.panzhihua.service_community.entity.ComSanshuoExpert;
 import com.panzhihua.service_community.service.ComSanShuoExpertService;
+import com.panzhihua.service_community.service.IComEventService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +21,7 @@
 import javax.annotation.Resource;
 import javax.xml.crypto.Data;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 三说会堂调解专家控制器
@@ -31,6 +34,8 @@
     private ComSanShuoExpertService comSanShuoExpertService;
     @Resource
     private UserService userService;
+    @Resource
+    private IComEventService comEventService;
 
     /**
      * 添加专家
@@ -83,6 +88,10 @@
     @DeleteMapping("/remove")
     public R remove(@RequestParam("id")Long id){
         //TODO 是否有为解决事件
+        List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, id).in(ComEvent::getEventProcessStatus, (1), (2), (5)));
+        if (list.size()!=0){
+            return R.fail("有未调解完成事件,无法删除!");
+        }
         ComSanshuoExpert expert = comSanShuoExpertService.getById(id);
         expert.setStatus(0);
         expert.setDelFlag(0);
@@ -96,6 +105,7 @@
     public R resetPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
         ComSanshuoExpert expert = comSanShuoExpertService.getById(comSanshuoExpertDTO.getId());
         expert.setPassword(comSanshuoExpertDTO.getPassword());
+        userService.sanShuoResetPassword(comSanshuoExpertDTO.getAccount(),comSanshuoExpertDTO.getPassword() );
         return R.ok(comSanShuoExpertService.updateById(expert));
     }
 

--
Gitblit v1.7.1