From 6a9af510b4b202aadb4b0141b2fb1b9eeae62b4c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 29 Nov 2021 11:25:27 +0800
Subject: [PATCH] 导入表格单位（保安）公司名称统一修改为企业名称
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 8d4ad7f..0c06b9c 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<>();
@@ -943,11 +943,13 @@
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
- Dept dept = deptService.getById(user.getDeptId());
+ Dept dept = deptService.getById(user2.getDeptId());
System.out.println("dept = " + dept);
+ Dept dept1 = deptService.getById(user.getDeptId());
+ System.out.println("dept1 = " + dept1);
//如果是南昌总公司分公司导入的
- if (dept.getParentId().equals(1432626178757275649L)){
- user2.setDeptId(dept.getId().toString());
+ if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
+ user2.setDeptId(dept1.getId().toString());
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
--
Gitblit v1.9.3