From e54fa40693227b1b8d1aeba6a03d078ce3d1169e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Feb 2024 09:24:56 +0800
Subject: [PATCH] 议事议题优化
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 5 ++---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 42 +++++++++++++++++++++---------------------
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 +-
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 +-
5 files changed, 26 insertions(+), 27 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 989afd9..823d68e 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
@@ -90,29 +90,29 @@
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
- if (district.getFilterFlag().equals(1)) {
- // 查询小区id
- IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
- List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- // 通过用户机构查询用户的物业公司
- // 通过用户机构查询用户的物业公司
- IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
- if (one != null) {
- IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
- // 通过物业公司，查询小区
- List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
- if (list.size() > 0) {
- List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
- districtIds.addAll(collect);
- }
- }
- district.setDistrictIdList(districtIds);
- if (districtIds.size() == 0) {
- return new ArrayList<>();
+ // if (district.getFilterFlag().equals(1)) {
+ // 查询小区id
+ IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
+ List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+ // 通过用户机构查询用户的物业公司
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ if (one != null) {
+ IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // 通过物业公司，查询小区
+ List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
+ if (list.size() > 0) {
+ List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
+ districtIds.addAll(collect);
}
}
+ district.setDistrictIdList(districtIds);
+ if (districtIds.size() == 0) {
+ return new ArrayList<>();
+ }
+ // }
}
Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
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 cf9b942..112047a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -121,5 +121,5 @@
* @param list
* @return
*/
- List<UserEntity> getUserInfoByDistrictIds(@Param("list") List<String> list);
+ List<User> getUserInfoByDistrictIds(@Param("list") List<String> list);
}
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 1aafc40..ccd39d3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -229,8 +229,7 @@
)
</select>
- <select id="getUserInfoByDistrictIds" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity"
- parameterType="java.util.List">
+ <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
SELECT
bu.id,
@@ -250,7 +249,7 @@
LEFT JOIN jczz_house jhe ON jhe.house_code = jh.house_code
LEFT JOIN jczz_district jd on jd.aoi_code=jhe.district_code
<where>
- and jd.id = in
+ and jd.id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
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 0755752..48fc873 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -268,5 +268,5 @@
*/
void importPoliceUser(List<PoliceUserExcel> data);
- List<UserEntity> getUserInfoByDistrictIds(String districtIds);
+ List<User> getUserInfoByDistrictIds(String districtIds);
}
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 02d2ecd..23ac009 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
@@ -611,7 +611,7 @@
}
@Override
- public List<UserEntity> getUserInfoByDistrictIds(String districtIds) {
+ public List<User> getUserInfoByDistrictIds(String districtIds) {
List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
return baseMapper.getUserInfoByDistrictIds(list);
}
--
Gitblit v1.9.3