From cbbd5469271a8486bd28db82ad3627434f6a1d17 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 29 五月 2024 14:09:06 +0800
Subject: [PATCH] 花城 修改随手拍管理模块:第一次处理随手拍内容,提示:该随手拍已处理,不可重复操作。需修改为:该随手拍已处理。若是再次点击处理按钮才提示:该随手拍已处理,不可重复操作2
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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..99d1c5f 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,8 @@
@PostMapping
public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
- comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+// comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+ comSanshuoExpertDTO.setAppId(getAppId());
return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
}
@@ -86,7 +87,8 @@
@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());
+// loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+ loginUserInfo.setAppId(getAppId());
return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
}
@@ -127,7 +129,7 @@
* */
@GetMapping("/expertShow")
public R expertShow(){
- return comSanShuoExpertService.expertShow();
+ return comSanShuoExpertService.expertShow(this.getLoginUserInfo().getAppId());
}
@@ -136,7 +138,8 @@
* */
@GetMapping("/expertRange")
public R expertRange(){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ LoginUserInfoVO loginUserInfo1=getLoginUserInfo();
+ LoginUserInfoVO loginUserInfo = userService.detailUser(loginUserInfo1.getUserId()).getData();
return comSanShuoExpertService.expertRange(loginUserInfo);
}
@@ -146,7 +149,8 @@
@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());
+ return comSanShuoExpertService.expertShowList(level,id,getAppId());
}
/**
@@ -181,10 +185,12 @@
@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);
+// loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+ loginUserInfo.setAppId(getAppId());
+ return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size,keyWord);
}
--
Gitblit v1.7.1