diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index faa9def9d..7efcac338 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -496,6 +496,17 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl{ + q.eq(LawsMonthlyReportWriteEO::getSaveState, SaveStateEnum.SUBMIT.getValue()); + q.or().isNull(LawsMonthlyReportWriteEO::getSaveState); + q.or(queryWrapper->{ + queryWrapper.eq(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); + queryWrapper.eq(LawsMonthlyReportWriteEO::getSaveState,SaveStateEnum.SAVE.getValue()); + }); + }); List lawsMonthlyReportWriteEOS = this.list(wrapper); if(lawsMonthlyReportWriteEOS.size() == 0){