From aabce4b306d3fb996a64ad41d40bc5629512d2fa Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 20 Apr 2024 10:01:01 +0800
Subject: [PATCH] 议事问题优化
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
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 1625b1a..871e434 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
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -54,6 +55,7 @@
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.PoliceUserExcel;
@@ -445,8 +447,12 @@
}
@Override
- public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
- List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
+ public List<UserExcel> exportUser(Wrapper<User> queryWrapper, String deptId) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
+ }
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ List<UserExcel> userList = baseMapper.exportUser(queryWrapper, deptIdList);
userList.forEach(user -> {
user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
@@ -603,11 +609,12 @@
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
-// IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
-// return bean1.getDistictUserByCode(houseCode);
- String deptId = AuthUtil.getDeptId();
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return baseMapper.selectUserByDept(deptIdList);
+ IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+ return bean1.getDistictUserByCode(houseCode);
+ // 通过huosecode 查询物业工作人员
+// String deptId = AuthUtil.getDeptId();
+// List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+// return baseMapper.selectUserByDept(deptIdList);
}
}
--
Gitblit v1.9.3