From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
index 841be8d..076ba33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
@@ -177,15 +177,19 @@
@ApiOperation(value = "微团队成员分页查询服务处理", response = ComFmsServiceVO.class)
@PostMapping("/service/pageDeal")
public R pageDealFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
- adminDTO.setCommunityId(this.getCommunityId());
- adminDTO.setUserId(this.getUserId());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setCommunityId(loginUserInfo.getCommunityId());
+ adminDTO.setUserId(loginUserInfo.getUserId());
+ adminDTO.setUserInfo(loginUserInfo);
return communityService.pageDealFmsService(adminDTO);
}
@ApiOperation(value = "微团队成员服务反馈", response = ComFmsServiceVO.class)
@PostMapping("/service/feedback")
public R feedbackFmsService(@RequestBody @Valid FeedbackFmsServiceDTO adminDTO) {
- adminDTO.setUserId(this.getUserId());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setUserId(loginUserInfo.getUserId());
+ adminDTO.setUserInfo(loginUserInfo);
return communityService.feedbackFmsService(adminDTO);
}
--
Gitblit v1.7.1