diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 72661e5e..3f08bc16 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -243,10 +243,12 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl handaleDataList = handleData.getDataList(); + List idList = new ArrayList<>(); + handaleDataList.forEach(h -> idList.add(h.getId())); wrapper.eq(ProcessEsAnnualReport::getWorkGroupUser, workGroupUser); - wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser); - wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId); - remove(wrapper); + removeByIds(idList); annualReport = annualReportDataVO.getDataList().get(0); String collectUserLeader = annualReport.getCollectUserLeader(); contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();