From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改，返回一键求助 3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 6554255..1edc9f8 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -53,10 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -143,13 +140,21 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<User> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ return page.setRecords(users);
}
@Override
- public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
+ public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
+// List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ if (deptId != null){
+ String arr =deptId.toString();
+ List<String> array = Arrays.asList(arr.split(","));
+ return page.setRecords(baseMapper.selectUserPages(page, user, array));
+ }else{
+ return page.setRecords(baseMapper.selectUserPages(page, user, null));
+ }
+
}
@Override
@@ -313,6 +318,7 @@
@Override
public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
+
List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
userList.forEach(user -> {
user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
--
Gitblit v1.9.3