From f4ca503a7a277ee6d6476990a069e44679a84775 Mon Sep 17 00:00:00 2001 From: zhenggl Date: Thu, 4 May 2023 18:38:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?create=E8=BF=87=E6=BB=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../athena/app/service/staff/StaffCreateEAIService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffCreateEAIService.java index a2b2948..c2ecf01 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffCreateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffCreateEAIService.java @@ -17,7 +17,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @Auther: zhenggl @@ -48,7 +47,6 @@ public class StaffCreateEAIService extends AbsEAIService { throw new DWRuntimeException("缺少必要参数"); } staffService.saveBatch(staffList); - List collect = staffList.stream().map(item -> new StaffEntity(item.getId(),item.getEmployeeNo())).collect(Collectors.toList()); - return EAIUtil.buildEAIResult(new JSONObject().fluentPut("wait_register_personnel",collect)); + return EAIUtil.buildEAIResult(new JSONObject().fluentPut("wait_register_personnel",staffList)); } } From 4778c4a192c77d0e2cfcb342c59b7230495f12dd Mon Sep 17 00:00:00 2001 From: zhenggl Date: Thu, 4 May 2023 18:44:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../digiwin/athena/app/service/staff/StaffUpdateEAIService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffUpdateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffUpdateEAIService.java index f485954..dd98cd0 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffUpdateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffUpdateEAIService.java @@ -74,7 +74,7 @@ public class StaffUpdateEAIService extends AbsEAIService { } List update = collect.get(false); if (!CollectionUtils.isEmpty(update)){ - staffRepository.updateStaffList(update, SecurityUtil.getUserProfile().getTenantSid()); + staffService.updateBatchById(update); } } else if (OptionEnums.TASK.getValue().equals(option)) { staffRepository.updateStatusAndDate(staffList, SecurityUtil.getUserProfile().getTenantSid());