From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 9582e1e..68fdaa7 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
@@ -125,6 +125,18 @@
}
/**
+ * 重置密码
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPassword")
+ public R resetPassword(@RequestParam("userId") Long userId) {
+ return userService.resetPassword(userId);
+ }
+
+ /**
* 某社区后台人员查询
*
* @param param
@@ -204,8 +216,8 @@
* @return 标签集合
*/
@PostMapping("listtag/getTag")
- public R listTags(@RequestParam("communityId") Long communityId) {
- return userService.listTags(communityId);
+ public R listTags() {
+ return userService.listTags();
}
/**
@@ -366,6 +378,19 @@
@PostMapping("putuserbackstage")
R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
return userService.putUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ public R adduserbackstageproperty(@RequestBody AdministratorsUserVO administratorsUserVO) {
+
+ return userService.addUserBackstageProperty(administratorsUserVO);
}
/**
@@ -1112,4 +1137,14 @@
return userService.getUserListByCommunityId(communityId);
}
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ @GetMapping("checkIsTeam")
+ public R checkCurrentUserIsTeam(String phone, Long communityId) {
+ return userService.checkCurrentUserIsTeam(phone, communityId);
+ }
}
--
Gitblit v1.7.1