修改单位变更

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -690,12 +690,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(noticeDto.getInstanceId());
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
+        List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+
         // 待调整
         taskCode = processTaskDTO.getNextTask().get(0).getKey();
         JgChangeRegistrationUnit JgChangeRegistrationUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         JgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         JgChangeRegistrationUnit.setPromoter("");
         JgChangeRegistrationUnit.setNextTaskId(nextTaskId);
+        JgChangeRegistrationUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
         JgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleListNext));
         JgChangeRegistrationUnitMapper.updateById(JgChangeRegistrationUnit);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(JgChangeRegistrationUnit));
@@ -807,6 +810,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         jgChangeRegistrationUnit.setInstanceStatus(String.join(",", roleList));
                     }
                     jgChangeRegistrationUnit.setPromoter(userId);
+                    jgChangeRegistrationUnit.setNextExecuteUserIds(nextUserIds);
                     jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
                     jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                     executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op);                }
@@ -814,6 +818,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationUnit.setPromoter("");
                 jgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleList));
                 jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
+                jgChangeRegistrationUnit.setNextExecuteUserIds(nextUserIds);
                 jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op);
             }