ezhizao_zx 9 mesiacov pred
rodič
commit
52ce21c9d4

+ 4 - 0
src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -99,6 +99,10 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         }
 
         List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
+        List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizDayworkAuxiliaryItem::getDayworkId).collect(Collectors.toList())).list();
+        list.forEach(e -> {
+            e.setDaywork(bizDayworks.stream().filter(v -> v.getId().equals(e.getDayworkId())).findFirst().orElse(null));
+        });
         return getDataTable(list);
     }