From ac3ee0c313a9eda72270ff3a141345685e3490e3 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 21 八月 2021 18:36:04 +0800
Subject: [PATCH] Merge branch 'zzj' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index aadd28b..c7e3595 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -111,6 +111,15 @@
R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
/**
+ * 微心愿搜索社区团队人员列表
+ * @param param 请求参数
+ * @param communityId 社区id
+ * @return 社区团队人员列表
+ */
+ @PostMapping("listactivitymanager2")
+ R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
+
+ /**
*分页查询人脸识别
* @param loginUserInfoVO 查询参数
* @return 分页集合
@@ -128,11 +137,11 @@
/**
*分页查询人口管理
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
@PostMapping("pageuser")
- R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
+ R pageUser(@RequestBody AppletUserInfoVO userInfoVO);
/**
* 查询所有人员标签
@@ -771,4 +780,23 @@
@PostMapping("user/getUserGrids")
R getGridIsOk(@RequestParam("userId")Long userId);
+
+ @GetMapping("getGridsMemberList")
+ R getGridsMemberList(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ R getUserOpenId(@RequestParam("userId")Long userId);
+
+ /**
+ * 查询社区后台工作人员列表
+ * @param communityId 社区id
+ * @return 社区后台工作人员列表
+ */
+ @GetMapping("getUserListByCommunityId")
+ R getUserListByCommunityId(@RequestParam("communityId")Long communityId);
}
--
Gitblit v1.7.1