From fe609c99cd295ac64aa76e31eee4ae21bb167302 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 30 九月 2021 09:11:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 c56ce43..340f8b6 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
@@ -129,6 +129,26 @@
R changePassword(@RequestBody ChangePasswordVO changePasswordVO);
/**
+ * 重置密码用户登录密码默认admin123456
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPassword")
+ R resetPassword(@RequestParam("userId") Long userId);
+
+ /**
+ * 批量重置密码用户登录密码默认admin123456
+ *
+ * @param userIds
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
+
+ /**
* 某社区后台人员查询
*
* @param param
@@ -314,6 +334,16 @@
R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
/**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
* 编辑运营、社区后台账户
*
* @param administratorsUserVO
@@ -341,7 +371,7 @@
* @return 角色集合
*/
@PostMapping("/role/listrolebackstage")
- R listRoleBackstage(@RequestParam("communityId") Long communityId);
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
/**
* 分页查询后台用户
@@ -1024,4 +1054,11 @@
*/
@PutMapping("disableOrEnableMerchantUsers")
R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @GetMapping("judgeCommunityTeam")
+ void judgeCommunityTeam(@RequestParam("openid") String openid);
}
--
Gitblit v1.7.1