From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java | 9 +++++----
1 files changed, 5 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 0628c7b..184db42 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
@@ -127,7 +127,7 @@
* */
@GetMapping("/expertShow")
public R expertShow(){
- return comSanShuoExpertService.expertShow();
+ return comSanShuoExpertService.expertShow(this.getLoginUserInfo().getAppId());
}
@@ -146,7 +146,7 @@
@GetMapping("/expertShowList")
public R expertShowList(@RequestParam(value = "level",required = false)Integer level,
@RequestParam(value = "id",required = false)Long id){
- return comSanShuoExpertService.expertShowList(level,id);
+ return comSanShuoExpertService.expertShowList(level,id,userService.detailUser(this.getUserId()).getData().getAppId());
}
/**
@@ -181,10 +181,11 @@
@GetMapping("/backstageList2")
public R backstageList(@RequestParam(value = "level",required = false)Integer level,
@RequestParam(value = "page",required = false)Integer page,
- @RequestParam(value = "size",required = false)Integer size){
+ @RequestParam(value = "size",required = false)Integer size,
+ @RequestParam(value = "keyWord",required = false)String keyWord){
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
- return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size);
+ return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size,keyWord);
}
--
Gitblit v1.7.1