|
@@ -512,18 +512,9 @@ public class TaskController extends BladeController {
|
|
|
List<FixedFlowLink> fixedFlowLinks = jdbcTemplate.query("SELECT * FROM u_fixed_flow_link WHERE is_deleted = 0 AND fixed_flow_id = ?", new Object[]{approvalDTO.getFixedFlowId()}, new BeanPropertyRowMapper<>(FixedFlowLink.class));
|
|
|
if (fixedFlowLinks.size() > 0) {
|
|
|
List<Long> userIds = fixedFlowLinks.stream().map(FixedFlowLink::getFixedFlowLinkUser).collect(Collectors.toList());
|
|
|
- String resultString = StringUtils.join(userIds, ",");
|
|
|
- /*检查签字证书信息*/
|
|
|
- if (ObjectUtil.isNotEmpty(resultString)) {
|
|
|
- R<Object> objectR = archiveFileTaskClient.checkTaskUserCertificateInfo(resultString);
|
|
|
- if (objectR.isSuccess()) {
|
|
|
- approvalDTO.setTaskUserIds(resultString);
|
|
|
- } else {
|
|
|
- throw new ServiceException("预设流程任务人没有签字证书信息");
|
|
|
- }
|
|
|
- }
|
|
|
+ approvalDTO.setTaskUserIds(StringUtils.join(userIds, ","));
|
|
|
|
|
|
- /*首先根据分支分组顺序排序*/
|
|
|
+ /*分支分组顺序排序*/
|
|
|
Map<String, List<FixedFlowLink>> collect = fixedFlowLinks.stream().collect(Collectors.groupingBy(obj -> obj.getFixedFlowBranchSort() + "@@@" + obj.getFixedFlowLinkType()));
|
|
|
sortedMap = new TreeMap<>((key1, key2) -> {
|
|
|
int branchSort1 = extractBranchSort(key1);
|
|
@@ -537,6 +528,10 @@ public class TaskController extends BladeController {
|
|
|
if (ObjectUtil.isEmpty(approvalDTO.getTaskUserIds())) {
|
|
|
throw new ServiceException("未获取到任务人信息");
|
|
|
}
|
|
|
+ R<Object> objectR = archiveFileTaskClient.checkTaskUserCertificateInfo(approvalDTO.getTaskUserIds());
|
|
|
+ if (!objectR.isSuccess()) {
|
|
|
+ throw new ServiceException("选择的任务人没有签字证书信息,请联系管理员");
|
|
|
+ }
|
|
|
|
|
|
/*主任务*/
|
|
|
Long processInstanceId = SnowFlakeUtil.getId();
|