From 6651bb95348b21a446e6b54a501a2aec521c5243 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 10:32:12 +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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 246c6e3..855d97c 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
@@ -46,7 +46,7 @@
@PostMapping
public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
- return comSanShuoExpertService.addExpert(comSanshuoExpertDTO);
+ return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
}
@GetMapping("/detail")
@@ -58,9 +58,8 @@
* 小程序获取可选择专家
* */
@GetMapping("/appletsList")
- public R appList(){
- comSanShuoExpertService.selectExpertList();
- return R.ok(comSanShuoExpertService.list(new QueryWrapper<ComSanshuoExpert>().eq("status",1).eq("del_flag",1)));
+ public R appList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){
+ return comSanShuoExpertService.selectExpertList(type, id,this.getLoginUserInfo().getCommunityId());
}
/**
@@ -68,10 +67,7 @@
* */
@PutMapping
public R update(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
- ComSanshuoExpert expert=new ComSanshuoExpert();
- BeanUtil.copyProperties(comSanshuoExpertDTO,expert);
- expert.setUpdateTime(new Date());
- return R.ok(comSanShuoExpertService.updateById(expert));
+ return R.ok(comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO));
}
/**
@@ -90,7 +86,6 @@
* */
@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("有未调解完成事件，无法删除！");
@@ -98,7 +93,12 @@
ComSanshuoExpert expert = comSanShuoExpertService.getById(id);
expert.setStatus(0);
expert.setDelFlag(0);
- return R.ok(comSanShuoExpertService.updateById(expert));
+ boolean b = comSanShuoExpertService.updateById(expert);
+ if (b){
+ //删除专家账号的权限
+ userService.removeExpertRole(expert.getPhone());
+ }
+ return R.ok();
}
/**
--
Gitblit v1.7.1