From bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:44:43 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index e34bf1b..7382277 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -91,7 +91,6 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
- comActDynVO.setAreaCode(this.getAreaCode());
Integer category = comActDynVO.getCategory();
if (isNull(category)) {
comActDynVO.setCategory(1);
@@ -134,7 +133,6 @@
comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
}
comActActivityVO.setIsApplets(1);
- comActActivityVO.setAreaCode(this.getAreaCode());
Integer status = comActActivityVO.getStatus();
if (null != status && status.intValue() == 4) {
comActActivityVO.setIsIng(1);
@@ -405,7 +403,7 @@
@RequestParam(value = "size",required = false) Integer size,
@RequestParam(value = "belongTo",required = false) String belongTo,
@RequestParam(value = "unitId",required = false) Long unitId){
- return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
+ return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,this.getLoginUserInfo().getAccount());
}
--
Gitblit v1.7.1