From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +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/api/ComSanShuoExpertApi.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 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 72ac94c..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
@@ -51,6 +51,7 @@
@PostMapping
public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
+ comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
}
@@ -82,10 +83,13 @@
@GetMapping("/backstageList")
public R backList(@RequestParam(value = "keyWord",required = false) String keyWord,
@RequestParam(value = "page",required = false)Integer page,
- @RequestParam(value = "size",required = false)Integer size){
+ @RequestParam(value = "size",required = false)Integer size,
+ @RequestParam(value = "level",required = false)Integer level){
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo);
+ loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
+ return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
}
+
/**
* 删除
@@ -123,11 +127,8 @@
* */
@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,userService.detailUser(this.getUserId()).getData().getAppId());
}
/**
@@ -164,7 +165,7 @@
* 导入专家信息
* */
@PostMapping("/importExpert")
- public R importExpert(MultipartFile multipartFile){
+ public R importExpert(@RequestBody MultipartFile multipartFile){
try {
ExcelListener listener=new ExcelListener(comSanShuoExpertService);
EasyExcel.read(multipartFile.getInputStream(),ComSanshuoExpert.class,listener).sheet().doRead();
@@ -174,6 +175,20 @@
return R.ok();
}
+ /**
+ * 后台获取专家列表
+ * */
+ @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 = "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