From 8e99321db3dfeedaf910c7a7c7f5afde60caafb7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 15:21:08 +0800
Subject: [PATCH] 枪支，派遣单位，考试成绩保存，成绩审查，主要管理人员，出资人，用户导入，新增，许可证信息等信息修改变动
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index 1a124c1..21979a4 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -29,6 +29,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.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.excel.EquipageExcel;
@@ -37,6 +38,7 @@
import org.springblade.modules.member.excel.memberImporter;
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
+import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
import org.springblade.modules.shareholder.excel.shareImporter;
import org.springblade.modules.system.service.MyAsyncService;
@@ -48,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -104,7 +107,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
public R save(@Valid @RequestBody Member member) throws Exception {
- Member member1 = member;
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
if (null!=member1.getName() && !member1.getName().equals("")){
member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
}
@@ -142,7 +145,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
public R update(@Valid @RequestBody Member member) throws Exception {
- Member member1 = member;
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
if (null!=member1.getName() && !member1.getName().equals("")){
member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
}
@@ -193,7 +196,6 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_member where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(memberService.removeByIds(Func.toLongList(ids)));
--
Gitblit v1.9.3