shenhe

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -82,14 +82,14 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             if (isStartWorkflow) {
                 Workflow workflow = workflowService
                         .findLatestWorkflowByBusinessCode("INOUTTASK-TASK-APPROVE");
-                // 调配没配置审核流程，直接结束调配并处理信息
+                // 没配置审核流程，直接结束并处理信息
                 if (workflow == null) {
                     throw new YException(YExceptionEnum.INTERVER_WORKFLOW_ERROR);
                 }
                 // 开启审核流
                 else {
 
-                    // 设置调配状态 已提交审核
+                    // 设置状态 已提交审核
                     inOutWarehouseTask.setWorkflowId(workflow.getId());
                     this.updateById(inOutWarehouseTask);
                     workflowService.startInstance(workflow.getId(), inOutWarehouseTask.getId());
@@ -112,14 +112,14 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             if (isStartWorkflow) {
                 Workflow workflow = workflowService
                         .findLatestWorkflowByBusinessCode("INOUTTASK-TASK-APPROVE");
-                // 调配没配置审核流程，直接结束调配并处理信息
+                // 没配置审核流程，直接结束并处理信息
                 if (workflow == null) {
                     throw new YException(YExceptionEnum.INTERVER_WORKFLOW_ERROR);
                 }
                 // 开启审核流
                 else {
 
-                    // 设置调配状态 已提交审核
+                    // 设置状态 已提交审核
                     inOutWarehouseTask.setWorkflowId(workflow.getId());
                     this.updateById(inOutWarehouseTask);
                     workflowService.startInstance(workflow.getId(), inOutWarehouseTask.getId());
@@ -178,11 +178,9 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
                 String taskId = "";
                 // 只有待审核状态才有taskId
-                if (StringUtils.equals(StatusEnum.TASK_REVIEWED.getFlag(), inOutWarehouseTask1.getTaskStatusKey())) {
-                    JSONObject jsonObject = workflowService.getActiveTask(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId(),Lists.newArrayList(inOutWarehouseTask1.getWorkflowId()), inOutWarehouseTask1.getId());
-                    String aa = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId();
+                if (StringUtils.isNotBlank(inOutWarehouseTask1.getWorkflowId())) {
+                    JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(inOutWarehouseTask1.getWorkflowId()), inOutWarehouseTask1.getId());
                     taskId = jsonObject.getString("taskId");
-                    List<String> roleIds = AuthSecurityUtils.getUserRoles(aa).stream().map(CommonRole::getRoleId).collect(Collectors.toList());
                     inOutWarehouseTask1.setTaskId(taskId);
                 }
             });