From 1b6430587fcf72e58510a32f7e6c88bda565f62e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 23 九月 2022 17:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 d43d4c2..95f3a8c 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
@@ -254,8 +254,8 @@
@ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
@GetMapping("listadvertisement/noToken")
- public R listAdvertisement() {
- return communityService.listAdvertisement();
+ public R listAdvertisement(@RequestParam(value = "type",required = false,defaultValue = "1") Integer type) {
+ return communityService.listAdvertisement(type);
}
@ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
@@ -285,7 +285,7 @@
@GetMapping("agreement")
@ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type);
+ return userService.agreement(type,this.getAppId());
}
@ApiOperation("发布留言")
@@ -395,7 +395,9 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
- communityId = loginUserInfo.getCommunityId();
+ if(loginUserInfo.getCommunityId()!=null){
+ communityId = loginUserInfo.getCommunityId();
+ }
}
return communityService.getUserReward(userId, communityId);
}
--
Gitblit v1.7.1