From d4ad4cd6c127aa5944685c4aa098e0015139e1a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 23 Nov 2021 22:25:06 +0800
Subject: [PATCH] 1.保安公司查询修改 2.报名列表修改 3.考试列表查询修改 4.保安员导入修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 9 +++++----
1 files changed, 5 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..3224f9e 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
@@ -800,7 +800,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 +942,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