wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-11-04 13:59:12 +08:00
commit 7d09b1c2ec
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java
View File

@ -41,7 +41,7 @@ public class CooperationOrgDTO implements Serializable {
private List<String> includeSpecialtyCodes; private List<String> includeSpecialtyCodes;
/** /**
* 控制仅支持工程内人员参与审批 * 该参数仅应用于节点的高级设置中的"仅支持工程内人员参与审批”
*/ */
private List<Long> projectIds; private List<Long> projectIds;

1
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
View File

@ -593,7 +593,6 @@ public class PrintAdminController implements PrintAdminApi {
request.setBizKey(dto.getProcessInstanceId()); request.setBizKey(dto.getProcessInstanceId());
request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF); request.setConversionType(DocConversionTypeEnum.HTML_URL_TO_PDF);
request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId())); request.setFileName(String.format(refreshProperties.getProcessLogHtmlUrl(), dto.getProcessInstanceId(), dto.getPersonId()));
request.setFileKey(dto.getPersonId());
String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request); String taskId = RpcExternalUtil.rpcApiResultProcessor(() -> docConversionApi.submitConvertTask(request), "创建网页转 PDF 的异步任务", request);
return CommonResponse.success(taskId); return CommonResponse.success(taskId);
} }