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/equipage/controller/GunController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/controller/GunController.java b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
index b21bdd5..2d5dc02 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/GunController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
@@ -12,6 +12,7 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.FTP.FtpUtil;
@@ -20,6 +21,7 @@
 import org.springblade.modules.equipage.excel.GunImporter;
 import org.springblade.modules.equipage.service.GunService;
 import org.springblade.modules.equipage.vo.GunVo;
+import org.springblade.modules.member.entity.Member;
 import org.springblade.modules.system.service.MyAsyncService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author zhongrj
@@ -87,7 +90,7 @@
 	public R submit(@RequestBody Gun gun) {
 		boolean status = false;
 		//脱敏处理
-		Gun gun1 = gun;
+		Gun gun1 = Objects.requireNonNull(BeanUtil.copy(gun, Gun.class));
 		gun1.setCardNumber("***");
 		gun1.setIssueTime(null);
 		gun1.setValidTime(null);
@@ -158,7 +161,6 @@
 		list.forEach(id -> {
 			//内网同步
 			String s1 = "delete from sys_gun where id = " + "'" + id + "'";
-			//FtpUtil.sqlFileUpload(s1);
 			myAsyncService.FTP(s1);
 		});
 		return R.status(gunService.removeByIds(Func.toLongList(ids)));

--
Gitblit v1.9.3