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/IndexApi.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 3f45bf0..3a40450 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -26,6 +26,7 @@
 import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
 import com.panzhihua.common.validated.AddGroup;
 import com.panzhihua.common.validated.PageGroup;
 import io.swagger.annotations.Api;
@@ -251,12 +252,18 @@
 
     @ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class)
     @PostMapping("pagemicrowish")
-    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO)
+    {
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
         if (loginUserInfo != null) {
             comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
             comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
         }
+
+        if(!StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
+        {
+            comActMicroWishVO.setCommunityId(null);
+        }
         comActMicroWishVO.setIsApplets(1);
         comActMicroWishVO.setIsPageMyWish(null);
         return communityService.pageMicroWishApplets(comActMicroWishVO);

--
Gitblit v1.7.1