From 7b9069282e0204f7bbd6a68baafbe1e506a356e3 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 11:04:03 +0800
Subject: [PATCH] 业委会根据小区id查询负责人
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 15 +++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/system/controller/UserController.java | 15 ++++++++++-----
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 7 +++++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 7 +++++++
6 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 4dfa1d4..c972fb9 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -77,7 +77,7 @@
*/
@Override
public Object getDistrictTree(DistrictVO district) {
- String userRole = AuthUtil.getUserRole();
+ // String userRole = AuthUtil.getUserRole();
// if (userRole.equals("wygly")) {
// IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
// List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
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 7b4d318..5a76a45 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -116,18 +116,23 @@
}
@GetMapping("/searchUser")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
- @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
- })
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "搜索用户", notes = "传入account和realName")
+ @ApiOperation(value = "搜索用户", notes = "传入name")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().listVO(pages.getRecords()));
}
+ @GetMapping("/searchUserByDistrictId")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "通过小区Id搜索用户", notes = "传入districtId")
+ // @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<List<UserVO>> searchUserByDistrictId(String districtId) {
+ List<User> resutl = userService.searchUserByDistrictId(districtId);
+ return R.data(UserWrapper.build().listVO(resutl));
+ }
+
/**
* 自定义用户列表
*/
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 2f45882..9ccec62 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -68,4 +68,11 @@
* @return
*/
List<UserVO> getUserListByParam(@Param("user") UserVO user);
+
+ /**
+ * 通过小区Id搜索用户
+ * @param districtId
+ * @return
+ */
+ List<User> searchUserByDistrictId(String districtId);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index ca5fa48..cc8db74 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -86,4 +86,19 @@
</if>
</select>
+ <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
+ SELECT
+ bu.*
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ LEFT JOIN jczz_district jd on jd.aoi_code=jda.aoi_code
+ WHERE
+ jd.id = #{districtId}
+ and bu.is_deleted = '0'
+ and jh.is_deleted = '0'
+
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index b4f6834..ae53be6 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -213,4 +213,11 @@
* @return
*/
List<UserVO> getUserListByParam(UserVO user);
+
+ /**
+ * 通过小区Id搜索用户
+ * @param districtId
+ * @return
+ */
+ List<User> searchUserByDistrictId(String districtId);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6e95565..12b4885 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -446,4 +446,14 @@
}
return baseMapper.getUserListByParam(user);
}
+
+ /**
+ * 通过小区Id搜索用户
+ * @param districtId
+ * @return
+ */
+ @Override
+ public List<User> searchUserByDistrictId(String districtId) {
+ return baseMapper.searchUserByDistrictId( districtId);
+ }
}
--
Gitblit v1.9.3