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

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

@@ -127,7 +127,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
         // 根据流程Id获取分管领导审核节点的审核人
         LambdaQueryWrapper<WorkflowRecord> workflowRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         workflowRecordLambdaQueryWrapper
-                .eq(WorkflowRecord::getNodeType, "用户任务")
+                .eq(WorkflowRecord::getNodeType, "开始节点")
                 .eq(WorkflowRecord::getNodeName, "分管领导意见")
                 .ne(WorkflowRecord::getCreateUserId, 0)
                 .eq(WorkflowRecord::getProcessId, taskId)
@@ -190,7 +190,7 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
         // 根据流程Id获取部门主任意见审核节点的审核人
         LambdaQueryWrapper<WorkflowRecord> workflowRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         workflowRecordLambdaQueryWrapper
-                .eq(WorkflowRecord::getNodeType, "用户任务")
+                .eq(WorkflowRecord::getNodeType, "开始节点")
                 .eq(WorkflowRecord::getNodeName, "部门主任意见")
                 .ne(WorkflowRecord::getCreateUserId, 0)
                 .eq(WorkflowRecord::getProcessId, taskId)