diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java index 1568595b..18ee8cfe 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java @@ -118,6 +118,7 @@ public class HealthCheckupListController { hcus.campus, hcus.subjectId, hcu.bz, + hcu.isAudit, hcus.receiveAddress, ca.campusName FROM @@ -164,9 +165,12 @@ public class HealthCheckupListController { v.setv("optionName", subject.getOptionName()); } - if (StrUtil.isNotBlank(v.getString("unionId"))) { - HealthCheckupUnionConfirm confirm = confirms.stream().filter(o -> o.getUnionId().equals(v.getString("unionId"))).findFirst().orElse(null); - v.setv("isAudit", confirm != null ? confirm.getIsAudit() : ""); + if (StrUtil.isNotBlank(v.getString("unionId")) && ObjectUtil.isNotEmpty(v.getBoolean("isAudit")) && v.getBoolean("isAudit")) { + HealthCheckupUnionConfirm confirm = confirms.stream() + .filter(o -> o.getUnionId().equals(v.getString("unionId"))) + .findFirst() + .orElse(null); +// v.setv("isAudit", confirm != null ? confirm.getIsAudit() : ""); v.setv("auditTime", confirm != null ? confirm.getAuditTime() : ""); } });