From 19ab131deeb1cc9ea5f0cac1bd5f7cfe577f4a9c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 17 Jul 2021 14:54:04 +0800
Subject: [PATCH] 处警员树接口修改

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 2ccca3a..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,12 +147,23 @@
 
 	@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));
 		}else{
 			return page.setRecords(baseMapper.selectUserPages(page, user, null));
+		}
+	}
+
+	@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));
 		}
 	}
 
@@ -465,5 +476,15 @@
 		return updateById(user);
 	}
 
+	@Override
+	public R<Boolean> saveUser(User user) {
+		return null;
+	}
+
+	@Override
+	public List<Map<String, Object>> selectUser() {
+		return baseMapper.selectUser();
+	}
+
 
 }

--
Gitblit v1.9.3