diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 0febb8a9..2a351531 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -342,10 +342,14 @@ public class EsRevisionServiceImpl extends ServiceImpl reviewMeetingDetails = data.getReviewMeetingDetails(); - ProcessEsRevision revisionDb = getById(data.getId()); + ProcessEsRevision revisionDb = getById(dataDb.getId()); List reviewMeetingDetailsDb = revisionDb.parseReviewMeetingDetails(); + if (reviewMeetingDetailsDb == null) { + reviewMeetingDetailsDb = new ArrayList<>(); + } reviewMeetingDetailsDb.addAll(reviewMeetingDetails); data.setReviewMeetingDetailJson(reviewMeetingDetailsDb); saveOrUpdate(data);