1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -8444,10 +8444,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         Integer companyId = user.getCompanyId();
         //是否要撤销相关数据
         List<ActualEmployeeTime> actualEmployeeTimes = hasPushForSap.getActualEmployeeTimes();
-        List<String> allUuids = actualEmployeeTimes.stream().map(ActualEmployeeTime::getUUID).distinct().collect(Collectors.toList());
-        List<String> needUuidList=new ArrayList<>();
-        String uuids = allUuids.stream().map(n -> n).collect(Collectors.joining(","));
-        cancelReportPushSap(uuids,user);
+        if(actualEmployeeTimes!=null&&actualEmployeeTimes.size()>0){
+            List<String> allUuids = actualEmployeeTimes.stream().map(ActualEmployeeTime::getUUID).distinct().collect(Collectors.toList());
+            List<String> needUuidList=new ArrayList<>();
+            String uuids = allUuids.stream().map(n -> n).collect(Collectors.joining(","));
+            cancelReportPushSap(uuids,user);
+        }
         msg.setData(actualEmployeeTimes);
         return msg;
     }