From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 18:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 a856ec3..2c1c9d4 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
@@ -51,7 +51,7 @@
@PostMapping
public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
- comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
+ comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
}
@@ -86,6 +86,7 @@
@RequestParam(value = "size",required = false)Integer size,
@RequestParam(value = "level",required = false)Integer level){
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
}
@@ -126,7 +127,7 @@
* */
@GetMapping("/expertShow")
public R expertShow(){
- return comSanShuoExpertService.expertShow();
+ return comSanShuoExpertService.expertShow(this.getLoginUserInfo().getAppId());
}
@@ -145,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,this.getLoginUserInfo().getAppId());
}
/**
@@ -180,8 +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){
- return comSanShuoExpertService.backstageList(level,getLoginUserInfo(),page,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,keyWord);
}
--
Gitblit v1.7.1