自定义流程接口-BUG修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -960,6 +960,12 @@ public class ActivitiServiceImpl implements ActivitiService {
                                     approveUserIds.addAll(customFlowPropertyDto.getApproveUsers().stream().map(x -> String.valueOf(x.getId())).collect(Collectors.toList()));
                                 }
                                 break;
+                            case ROLE://角色
+                                if (Objects.nonNull(customFlowPropertyDto.getApproveRoles()) && customFlowPropertyDto.getApproveRoles().size() > 0) {
+//                                    List<SysUser> sysUserList = sysUserService.findByRoleIds(customFlowPropertyDto.getApproveRoles().stream().map(x -> x.getId()).collect(Collectors.toList()));
+//                                    approveUserIds.addAll(sysUserList.stream().map(x -> String.valueOf(x.getId())).collect(Collectors.toList()));
+                                }
+                                break;
                             default:
                                 break;
                         }
@@ -1384,7 +1390,6 @@ public class ActivitiServiceImpl implements ActivitiService {
      */
     @Override
     public FlowViewResult getFlowView(Long flowId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         TFCustomFlowEntity tfCustomFlowEntity = tfCustomFlowEntityService.findByFlowId(flowId);
         Optional.ofNullable(tfCustomFlowEntity).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程实体数据为空"));
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1636,7 +1636,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         Optional.ofNullable(tfCustomFlow).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到自定义流程数据"));
 
         if (tfCustomFlow.getVersion().intValue() != version.intValue()) {
-            Optional.ofNullable(tfCustomFlow).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程数据已发生改变，请刷新重试"));
+            throw ExceptionResultEnum.ERROR.exception("自定义流程数据已发生改变，请刷新重试");
         }
 
         JSONObject jsonObject = JSONObject.parseObject(examTaskApplyTemp.getExamTaskContent());