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/IndexApi.java | 10 +++++++++-
1 files changed, 9 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 a77135f..c067166 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
@@ -65,6 +65,7 @@
if (loginUserInfo != null) {
comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
}
return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@@ -115,6 +116,13 @@
@PostMapping("/editEasyPhotoHandler")
public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
+ @ApiImplicitParam(name = "id", value = "处理id", required = true)
+ @GetMapping("/easyPhotoHandler")
+ public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
+ return this.communityService.detailEasyPhotoHandler(id);
}
@ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@@ -277,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("发布留言")
--
Gitblit v1.7.1