From 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 07 May 2021 14:59:07 +0800
Subject: [PATCH] 保安筛选逻辑调整
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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 4b3ba1a..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
@@ -48,14 +48,12 @@
import org.springblade.system.user.service.IUserOauthService;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
import org.springblade.system.user.wrapper.UserWrapper;
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;
@@ -142,7 +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, 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
@@ -306,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()));
@@ -396,4 +409,14 @@
return userVO;
}
+ /**
+ * 查询处警人员列表
+ * @param page 分页
+ * @param user 用户对象
+ * @return
+ */
+ @Override
+ public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
+ return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
+ }
}
--
Gitblit v1.9.3