From 48ca388f8e5ff6e5ecc972e1d12b3f128cb98e3e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:32:41 +0800
Subject: [PATCH] 处警队伍管理列表接口修改，新增部门，处警员状态信息
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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..73d0910 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,6 +48,7 @@
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;
@@ -143,6 +144,12 @@
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));
+ }
+
+ @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));
}
@Override
@@ -306,6 +313,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 +404,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