From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index bd45334..5e386bb 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -20,6 +20,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.common.utils.DesensitizedUtil;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.FTP.FtpUtil;
 import org.springblade.modules.dispatcher.entity.Dispatcher;
 import org.springblade.modules.dispatcher.entity.DispatcherUnit;
@@ -38,6 +39,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -171,7 +173,7 @@
 			dispatcherUnit.setCreateTime(new Date());
 
 			//内网
-			DispatcherUnit dispatcherUnit1 = dispatcherUnit;
+			DispatcherUnit dispatcherUnit1 = Objects.requireNonNull(BeanUtil.copy(dispatcherUnit, DispatcherUnit.class));
 			//脱敏处理
 			if (null!=dispatcherUnit.getLinkman()) {
 				dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
@@ -183,24 +185,23 @@
 			dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
 
 			//新增
-			this.save(dispatcherUnit);
+			this.save(dispatcherUnit1);
 
 			//数据同步
 			String s1 =
 				"insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time,serve_type,security_linkman,cell,num) " +
-					"values(" + "'" + dispatcherUnit.getId() + "'" + "," +
+					"values(" + "'" + dispatcherUnit1.getId() + "'" + "," +
 					"'" + dispatcherUnit.getName() + "'" + "," +
 					"'" + dispatcherUnit.getDeptId() + "'" + "," +
-					"'" + dispatcherUnit1.getLinkman() + "'" + "," +
-					"'" + dispatcherUnit1.getPhone() + "'" + "," +
+					"'" + dispatcherUnit.getLinkman() + "'" + "," +
+					"'" + dispatcherUnit.getPhone() + "'" + "," +
 					"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
 					"'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
 					"'" + new SimpleDateFormat("yyyy/MM/dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
 					"'" + dispatcherUnit.getServeType() + "'" + "," +
-					"'" + dispatcherUnit1.getSecurityLinkman() + "'" + "," +
-					"'" + dispatcherUnit1.getCell() + "'" + "," +
+					"'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
+					"'" + dispatcherUnit.getCell() + "'" + "," +
 					"'" + dispatcherUnit.getNum() + "'" + ")";
-			//FtpUtil.sqlFileUpload(s1);
 			myAsyncService.FTP(s1);
 		});
 	}

--
Gitblit v1.9.3