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 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 892455b..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;
@@ -148,9 +145,16 @@
}
@Override
- public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList));
+ 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
--
Gitblit v1.9.3