diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java index 1b33507..95e3429 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java @@ -280,7 +280,12 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ query.like(PersonnelPlanLog::getApplicant, unit); } - return R.ok(service.page(page.getPageSo().toPage(), query)); + Page data = service.page(page.getPageSo().toPage(), query); + data.getRecords().forEach(o -> { + o.setFiles1(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"1")); + o.setFiles2(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"2")); + }); + return R.ok(data); } @Override diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java index 207cab7..4233846 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java @@ -182,6 +182,7 @@ public class SzCaseController extends AbstractCommonFileController{ List vos = Lists.newArrayList(); List list = query.list(); + if (CollectionUtils.isNotEmpty(list)){ Map sourceCount = Maps.newHashMap(); switch (num){