From fe9c6432b0b6eea428bbb856fabe4f7d1e84f0cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 17:16:01 +0800
Subject: [PATCH] 保安员资格审查查询修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 309a5a8..155e3dd 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
@@ -41,6 +41,7 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.system.entity.*;
+import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.service.IRoleService;
@@ -432,9 +433,8 @@
* 自定义用户列表(只有保安员)
*/
@Override
- public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
+ public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user) {
+ return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
}
/**
@@ -445,4 +445,44 @@
public List<User> getAllUserList() {
return baseMapper.getAllUserList();
}
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ @Override
+ public List<User> getNotAuditAllUserList() {
+ return baseMapper.getNotAuditAllUserList();
+ }
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ @Override
+ public IPage<User> selectUserPages(IPage<User> page, User user) {
+ return page.setRecords(baseMapper.selectUserPages(page, user));
+ }
+
+ /**
+ * 根据保安员编码查询保安员信息
+ * @param securityNumber
+ * @return
+ */
+ @Override
+ public UserVO getUserInfoBySecurityNumber(String securityNumber) {
+ return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ }
+
+ /**
+ * 导出用户审查明细
+ * @param user
+ * @return
+ */
+ @Override
+ public List<SecurityExcel> exportSecurity(UserVO user) {
+ return baseMapper.exportSecurity(user);
+ }
}
--
Gitblit v1.9.3