From b69bc7c024582dadf34f88e43ff0bcc0f8e07f9f Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 20:01:13 +0800
Subject: [PATCH] 特殊群体标签重复bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 81f2324..86520d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -6,10 +6,7 @@
 import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
 import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.dtos.user.*;
-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 com.panzhihua.common.utlis.ClazzUtils;
@@ -149,12 +146,12 @@
     /**
      * 分页查询人口管理
      *
-     * @param loginUserInfoVO 查询参数
+     * @param userInfoVO 查询参数
      * @return 分页数据
      */
     @PostMapping("pageuser")
-    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
-        return userService.pageUser(loginUserInfoVO);
+    public R pageUser(@RequestBody AppletUserInfoVO userInfoVO) {
+        return userService.pageUser(userInfoVO);
     }
 
     /**
@@ -983,4 +980,19 @@
         return userService.getGridIsOk(userId);
     }
 
+    @GetMapping("getGridsMemberList")
+    public R getGridsMemberList(@RequestParam("communityId") Long communityId) {
+        return userService.getGridsMemberList(communityId);
+    }
+
+    /**
+     * 根据用户id查询用户openid
+     * @param userId    用户id
+     * @return  openid
+     */
+    @GetMapping("getUserOpenId")
+    public R getUserOpenId(@RequestParam("userId")Long userId) {
+        return userService.getUserOpenId(userId);
+    }
+
 }

--
Gitblit v1.7.1