From 239e649bfec17f28b19a2536c5bbaefae2b8d7c8 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 30 九月 2022 16:22:56 +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 | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..1ff29d8 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
@@ -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 ("type")Integer type,@RequestParam("id")Long id){
+ return comSanShuoExpertService.selectExpertList(type, id,this.getLoginUserInfo().getCommunityId());
}
/**
@@ -98,7 +97,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();
}
/**
@@ -155,4 +159,6 @@
}
+
+
}
--
Gitblit v1.7.1