From 3851bbe241d3f5caa9b208d6740b94f6d537b5c2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 29 Nov 2021 11:30:52 +0800
Subject: [PATCH] 1.押运人员编码查询
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 7 ++++++-
1 files changed, 6 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 fe6fcae..926be67 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
@@ -187,6 +187,7 @@
@Override
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
+ //机构名称拼接
userVOS.forEach(userVO -> {
if (null != userVO.getCardid() && userVO.getCardid() != "") {
userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
@@ -800,7 +801,6 @@
* @param isCovered
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
//将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
@@ -1636,4 +1636,9 @@
throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
}
}
+
+ @Override
+ public List<Map<String, Object>> selectEquipent() {
+ return baseMapper.selectEquipent();
+ }
}
--
Gitblit v1.9.3