From c199d41a417faa6e0370d75f3437cd78cffff0b5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 09 Aug 2021 20:42:52 +0800
Subject: [PATCH] 1.派遣记录查询接口修改 2.取消报名接口新增 3.保安列表（未持证）查询接口新增
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 67 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 31 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 a75d1a8..a83eccc 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
@@ -140,7 +140,7 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -300,46 +300,29 @@
public void importUser(List<UserExcel> data, Boolean isCovered) {
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
- // 设置用户平台
- user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1));
- // 设置部门ID
- user.setDeptId(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName()));
- // 设置岗位ID
- user.setPostId(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()));
- // 设置角色ID
- user.setRoleId(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()));
// 设置租户ID
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
- // 覆盖数据
- if (isCovered) {
- // 查询用户是否存在
- User oldUser = UserCache.getUser(userExcel.getTenantId(), userExcel.getAccount());
- if (oldUser != null && oldUser.getId() != null) {
- user.setId(oldUser.getId());
- this.updateUser(user);
- return;
- }
- }
- // 获取默认密码配置
+ user.setRoleId("1412226235153731586");
+ //获取默认密码配置
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
user.setPassword(initPassword);
this.submit(user);
});
}
- @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()));
- user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
- user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
- user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
- });
- return userList;
- }
+// @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()));
+// user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
+// user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
+// user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
+// });
+// return userList;
+// }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -438,5 +421,27 @@
return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
}
+ /**
+ * 自定义用户列表(只有保安员),根据保安员查
+ */
+ @Override
+ public List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
+ }
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param deptId
+ * @param tenantId
+ * @return
+ */
+ @Override
+ public IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserPageSecurityApply(page, user, null, tenantId);
+ }
}
--
Gitblit v1.9.3