From 43501d34151d28ef35eba7263076834a8ea7d7f3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 01 Mar 2024 18:02:10 +0800
Subject: [PATCH] 物业公司查询的物业人人员查询
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 e309a8a..259c52c 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
@@ -17,6 +17,7 @@
package org.springblade.modules.system.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -212,9 +213,9 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
- if (null == deptId && !AuthUtil.isAdministrator()) {
- deptId = Long.parseLong(AuthUtil.getDeptId());
+ public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -599,14 +600,23 @@
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
- IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
- return bean1.getDistictUserByCode(houseCode);
+// IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+// return bean1.getDistictUserByCode(houseCode);
+ String deptId = AuthUtil.getDeptId();
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserByDept(deptIdList);
}
}
@Override
public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
return baseMapper.getUserInfoByDistrictId(districtId, building);
+ }
+
+ @Override
+ public List<User> getUserInfoByDistrictIds(String districtIds) {
+ List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
+ return baseMapper.getUserInfoByDistrictIds(list);
}
/**
@@ -748,8 +758,14 @@
list.remove(deptPcs.getId().toString());
user.setDeptId(String.join(",",list));
}
- if (!user.getDeptId().contains(dept.getId().toString())) {
- user.setDeptId(user.getDeptId() + "," + dept.getId());
+ // 删完后可能就没了
+ if (!Strings.isBlank(user.getDeptId())) {
+ if (!user.getDeptId().contains(dept.getId().toString())) {
+ user.setDeptId(user.getDeptId() + "," + dept.getId());
+ }
+ }else {
+ // 删完后的
+ user.setDeptId(dept.getId().toString());
}
}else {
if (!user.getDeptId().contains(dept.getId().toString())) {
--
Gitblit v1.9.3