From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
index bc65633..2ebd80f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -32,10 +32,9 @@
@ApiOperation(value = "分页查询便民服务商家",response = ComCvtBusinessVO.class)
@PostMapping("/business/area/page")
public R pageComCvtBusiness(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- Long communityId = loginUserInfo.getCommunityId();
- if (null!=communityId && 0!=communityId) {
- comCvtBusinessAppletsDTO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comCvtBusinessAppletsDTO.setCommunityId(loginUserInfo.getCommunityId());
}
return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
}
--
Gitblit v1.7.1