From eceb0c8f9480995c8a17f1d093f4e658268b234c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 16 Jul 2021 15:46:30 +0800
Subject: [PATCH] 警情任务分类显示问题修复
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 e83fac0..d653e66 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
@@ -147,7 +147,7 @@
@Override
public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
- if (deptId != null){
+ if (deptId != null && !deptId.equals("")){
String arr =deptId.toString();
List<String> array = Arrays.asList(arr.split(","));
return page.setRecords(baseMapper.selectUserPages(page, user, array));
@@ -157,6 +157,17 @@
}
@Override
+ public IPage<User> selectUserPagetxl(IPage<User> page, User user, String deptId) {
+ if (deptId != null && !deptId.equals("")){
+ String arr =deptId.toString();
+ List<String> array = Arrays.asList(arr.split(","));
+ return page.setRecords(baseMapper.selectUserPagetxl(page, user, array));
+ }else{
+ return page.setRecords(baseMapper.selectUserPagetxl(page, user, null));
+ }
+ }
+
+ @Override
public IPage<UserVO> selectUserSearch(UserVO user, Query query) {
LambdaQueryWrapper<User> queryWrapper = Wrappers.<User>query().lambda();
if (StringUtil.isNotBlank(user.getName())) {
--
Gitblit v1.9.3