bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -7,6 +7,7 @@ import com.mortals.xhx.common.code.GoWorkResultEnum;
 import com.mortals.xhx.common.code.OffWorkResultEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
 import com.mortals.xhx.module.attendance.model.vo.AttendStatInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -41,7 +42,6 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda
     protected void findAfter(AttendanceRecordEntity params, PageInfo pageInfo, Context context, List<AttendanceRecordEntity> list) throws AppException {
         list.stream().map(item -> {
             List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery().recordId(item.getId()));
-
             item.setAttendanceRecordDetailList(attendanceRecordDetailEntities);
             return item;
         }).collect(Collectors.toList());
@@ -49,12 +49,14 @@ public class AttendanceRecordServiceImpl extends AbstractCRUDServiceImpl<Attenda
 
     @Override
     protected void findAfter(AttendanceRecordEntity entity, Context context, List<AttendanceRecordEntity> list) throws AppException {
-        Map<Long, List<AttendanceRecordDetailEntity>> collect = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery()).parallelStream().collect(Collectors.groupingBy(x -> x.getRecordId()));
+        //Map<Long, List<AttendanceRecordDetailEntity>> collect = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery()).parallelStream().collect(Collectors.groupingBy(x -> x.getRecordId()));
         list.stream().map(item -> {
-            List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = collect.getOrDefault(item.getId(), new ArrayList<>());
-            attendanceRecordDetailEntities.forEach(i -> {
-                i.setStaffId(item.getStaffId());
-            });
+            List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery().recordId(item.getId()));
+            if(CollectionUtils.isNotEmpty(attendanceRecordDetailEntities)) {
+                attendanceRecordDetailEntities.forEach(i -> {
+                    i.setStaffId(item.getStaffId());
+                });
+            }
             //List<AttendanceRecordDetailEntity> attendanceRecordDetailEntities = attendanceRecordDetailService.find(new AttendanceRecordDetailQuery().recordId(item.getId()));
             item.setAttendanceRecordDetailList(attendanceRecordDetailEntities);
             return item;