Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentReceivedServiceImpl.java

@@ -130,6 +130,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
                 .eq(WorkflowRecord::getNodeType, "用户任务")
                 .eq(WorkflowRecord::getNodeName, "分管领导意见")
                 .ne(WorkflowRecord::getCreateUserId, 0)
+                .eq(WorkflowRecord::getProcessId, taskId)
                 .orderByDesc(WorkflowRecord::getRecordTime)
                 .last("limit 1")
         ;
@@ -192,6 +193,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
                 .eq(WorkflowRecord::getNodeType, "用户任务")
                 .eq(WorkflowRecord::getNodeName, "部门主任意见")
                 .ne(WorkflowRecord::getCreateUserId, 0)
+                .eq(WorkflowRecord::getProcessId, taskId)
                 .orderByDesc(WorkflowRecord::getRecordTime)
                 .last("limit 1")
         ;