From 2b6c540c6b20e04f8b2a05e6f0c22ba5d5016364 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 14:09:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
index 351abf5..aad7e21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
@@ -3,6 +3,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -13,6 +14,9 @@
import javax.annotation.Resource;
import java.util.List;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* 项目宣传表(ComActSocialProjectPublicity)表控制层
@@ -40,7 +44,12 @@
@ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
@PostMapping("queryAll")
public R selectAll(@RequestBody CommonPage commonPage) {
- commonPage.setCommunityId(this.getCommunityId());
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(commonPage.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
return communityService.selectAllComActSocialProjectPublicity(commonPage);
}
--
Gitblit v1.7.1