From 17f721cfd2595f5337406ac69a7e426d8d24bde5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 15 Jan 2024 09:11:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E6=B5=81=E7=A8=8B):=2080?= =?UTF-8?q?760?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/activiti/process/aspect/ProcessAspect.java | 2 +- .../esdeclare/service/impl/EsDeclareFlowServiceImpl.java | 4 +++- .../esinspect/service/impl/EsInspectFlowServiceImpl.java | 4 +++- .../service/impl/EsInspectDelayApplyFlowServiceImpl.java | 4 +++- .../service/impl/EsInspectPlanFlowServiceImpl.java | 4 +++- .../service/impl/EsInspectRectifyFlowServiceImpl.java | 4 +++- .../service/impl/EsPermissionApplyFlowServiceImpl.java | 4 +++- .../service/impl/MeetingManageFlowServiceImpl.java | 4 +++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index 03d38d96..2c9e60fc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java @@ -226,7 +226,7 @@ public class ProcessAspect { processDraft.setSaveSource(REVOCATION); processDraft.setInfoJsonStr(processDraft.getInfoJsonStr().replaceFirst("\\{", "{\"revocation\": true,")); processDraftService.save(processDraft); - + if (jp.getSignature().getName().equals("flowStart")){ // 发起后删除草稿 processDraftService.remove(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 339d72e8..181e7a2f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java @@ -183,7 +183,9 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 4832cce2..d569f918 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -250,7 +250,9 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index c72c7788..1299e724 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -176,7 +176,9 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 914eda6c..c418ce58 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -228,7 +228,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index 2f612276..df39920b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -143,7 +143,9 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 922c6d1b..0cec2e30 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -152,7 +152,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 3f383b3f..86e563ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -171,7 +171,9 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { // 是否存在草稿 List processDraftList = processDraftService.list(new LambdaQueryWrapper() .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId())); + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + .or().isNull(ProcessDraft::getSaveSource))); if (!processDraftList.isEmpty()){ String id = ""; if(Objects.isNull(processAll)){