From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
index 98357b8..6991cf2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoExpertDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.entity.ComSanshuoExpert;
 
@@ -13,16 +14,35 @@
      * @param comSanshuoExpertDTO
      * @return 处理结果
      * */
-    R addExpert(ComSanshuoExpertDTO comSanshuoExpertDTO);
+    R addOrUpdateExpert(ComSanshuoExpertDTO comSanshuoExpertDTO);
 
     /**
      * 后台获取专家列表
      * @param page
      * @param keyWord
      * @param size
-     * @param range 数据范围:1街道下属/2社区下属/3业务中心下属/null三说会堂下属
-     * @param id 社区或街道或业务中心id
      * @return 处理结果
      * */
-    R expertPage(String keyWord, Integer page, Integer size,Integer range,Long id);
+    R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo);
+
+    /**
+     * 专家风采列表
+     * @return 出列记过
+     * */
+    R expertShow();
+
+    /**
+     * 专家级别与单位范围
+     * */
+    R expertRange(LoginUserInfoVO loginUserInfo);
+
+    /**
+     * 小程序获取专家列表
+     * */
+    R selectExpertList(Integer type,Long id,Long cid);
+
+    /**
+     * 专家风采列表
+     * */
+    R expertShowList(Integer level, Long id);
 }

--
Gitblit v1.7.1