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/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index aa0621e..c909091 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -8,12 +8,10 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
-import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -79,6 +77,14 @@
* @return 人员集合
*/
R listActivityManager(String param, Long communityId);
+
+ /**
+ * 微心愿搜索社区团队人员列表
+ * @param param 请求参数
+ * @param communityId 社区id
+ * @return 社区团队人员列表
+ */
+ R listActivityManager2(String param, Long communityId);
/**
*分页查询人脸识别
* @param loginUserInfoVO 查询参数
@@ -93,10 +99,10 @@
R putUserFace(LoginUserInfoVO loginUserInfoVO);
/**
*分页查询人口管理
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
- R pageUser(LoginUserInfoVO loginUserInfoVO);
+ R pageUser(AppletUserInfoVO userInfoVO);
/**
* 查询所有人员标签
* @return 标签集合
@@ -469,4 +475,14 @@
R listAgreements(Long communityId);
R getGridIsOk(Long userId);
+
+ R getGridsMemberList(Long communityId);
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ R getUserOpenId(Long userId);
+
}
--
Gitblit v1.7.1