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 a2c35912..ed6124da 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 @@ -127,7 +127,6 @@ public class ProcessAspect { .ne(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) .set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue()) .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue())); - } } log.info("==========流程会签节点驳回一票否决前置方法结束=========="); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java index 65572025..92e4a320 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java @@ -23,6 +23,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.Objects; /** * @author ThinkBook @@ -161,8 +162,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl