From 19c0886badef2cb971b8bfd3d5eadea3cbe74bc4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 26 Jan 2024 18:00:23 +0800
Subject: [PATCH] 区域过滤去除上饶市
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 7ac974d..01f7529 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -182,7 +182,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ @PreAuth("hasAnyRole('administrator', 'admin','wygly')")
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.submit(user));
@@ -390,9 +390,45 @@
* 修改
*/
@GetMapping("/getUserInfoByCode")
- @ApiOperation(value = "查询人员", notes = "houseCode")
- public R getUserInfoByCode(@RequestParam("houseCode") String houseCode, @RequestParam(value = "type",defaultValue = "2") String type) {
- return R.data(userService.getUserInfoByCode(houseCode,type));
+ @ApiOperation(value = "查询物业人员/网格人员", notes = "houseCode")
+ public R getUserInfoByCode(@RequestParam("houseCode") String houseCode, @RequestParam(value = "type", defaultValue = "2") String type) {
+ return R.data(userService.getUserInfoByCode(houseCode, type));
+ }
+
+
+ /**
+ * 通过小区id查询物业人员/网格人员
+ */
+ @GetMapping("/getUserInfoByDistrictId")
+ @ApiOperation(value = "查询物业人员/网格人员", notes = "houseCode")
+ public R getUserInfoByDistrictId(@RequestParam("districtId") String districtId, @RequestParam(value = "building", required = false) String building) {
+ return R.data(userService.getUserInfoByDistrictId(districtId, building));
+ }
+
+
+ /**
+ * 通过机构查询物业公司人员
+ */
+ @GetMapping("/getUserInfoByPropertyCompanyId")
+ @ApiOperation(value = "通过机构查询物业公司人员", notes = "propertyCompanyId")
+ public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId,@RequestParam("roleId") String roleId) {
+ return R.data(userService.getUserInfoByPropertyId(propertyCompanyId,roleId));
+ }
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @GetMapping("/handleUserDept")
+ public R handleUserDept() {
+ return R.data(userService.handleUserDept());
+ }
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @GetMapping("/handleUser")
+ public R handleUser() {
+ return R.data(userService.handleUser());
}
}
--
Gitblit v1.9.3