Merge branch 'sprint/S1' into develop

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<StaffEntity> 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));
     }
 }

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<StaffEntity> 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());