From fec1341c1cb8e11cfbe3fa7dfabe447edb72b630 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 15:12:43 +0800
Subject: [PATCH] refactor(auth): 移除多个模块中的权限校验注解
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
index add6f20..675b4b8 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
@@ -11,6 +11,7 @@
import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.service.attach.BpmBusinessAttachService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
@@ -56,6 +57,8 @@
private BpmProcessDefinitionService processDefinitionService;
@Resource
private BpmCategoryService categoryService;
+ @Resource
+ private BpmBusinessAttachService businessAttachService;
@Resource
private AdminUserApi adminUserApi;
@@ -64,7 +67,6 @@
@GetMapping("/my-page")
@Operation(summary = "鑾峰緱鎴戠殑瀹炰緥鍒嗛〉鍒楄〃", description = "鍦ㄣ�愭垜鐨勬祦绋嬨�戣彍鍗曚腑锛岃繘琛岃皟鐢�")
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
public CommonResult<PageResult<BpmProcessInstanceRespVO>> getProcessInstanceMyPage(
@Valid BpmProcessInstancePageReqVO pageReqVO) {
PageResult<HistoricProcessInstance> pageResult = processInstanceService.getProcessInstancePage(
@@ -131,7 +133,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鎸囧畾娴佺▼瀹炰緥", description = "鍦ㄣ�愭祦绋嬭缁嗐�戠晫闈腑锛岃繘琛岃皟鐢�")
@Parameter(name = "id", description = "娴佺▼瀹炰緥鐨勭紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
public CommonResult<BpmProcessInstanceRespVO> getProcessInstance(@RequestParam("id") String id) {
HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(id);
if (processInstance == null) {
@@ -173,7 +174,6 @@
@GetMapping("/get-approval-detail")
@Operation(summary = "鑾峰緱瀹℃壒璇︽儏")
@Parameter(name = "id", description = "娴佺▼瀹炰緥鐨勭紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
@SuppressWarnings("unchecked")
public CommonResult<BpmApprovalDetailRespVO> getApprovalDetail(@Valid BpmApprovalDetailReqVO reqVO) {
if (StrUtil.isNotEmpty(reqVO.getProcessVariablesStr())) {
@@ -184,7 +184,6 @@
@GetMapping("/get-next-approval-nodes")
@Operation(summary = "鑾峰彇涓嬩竴涓墽琛岀殑娴佺▼鑺傜偣")
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
@SuppressWarnings("unchecked")
public CommonResult<List<BpmApprovalDetailRespVO.ActivityNode>> getNextApprovalNodes(@Valid BpmApprovalDetailReqVO reqVO) {
if (StrUtil.isNotEmpty(reqVO.getProcessVariablesStr())) {
@@ -196,7 +195,6 @@
@GetMapping("/get-bpmn-model-view")
@Operation(summary = "鑾峰彇娴佺▼瀹炰緥鐨� BPMN 妯″瀷瑙嗗浘", description = "鍦ㄣ�愭祦绋嬭缁嗐�戠晫闈腑锛岃繘琛岃皟鐢�")
@Parameter(name = "id", description = "娴佺▼瀹炰緥鐨勭紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
public CommonResult<BpmProcessInstanceBpmnModelViewRespVO> getProcessInstanceBpmnModelView(
@RequestParam(value = "id") String id) {
return success(processInstanceService.getProcessInstanceBpmnModelView(id));
@@ -205,7 +203,6 @@
@GetMapping("/get-print-data")
@Operation(summary = "鑾峰緱娴佺▼瀹炰緥鐨勬墦鍗版暟鎹�")
@Parameter(name = "id", description = "娴佺▼瀹炰緥鐨勭紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
public CommonResult<BpmProcessPrintDataRespVO> getProcessInstancePrintData(
@RequestParam("processInstanceId") String processInstanceId) {
HistoricProcessInstance historicProcessInstance = processInstanceService.getHistoricProcessInstance(processInstanceId);
@@ -217,10 +214,16 @@
List<HistoricTaskInstance> tasks = taskService.getFinishedTaskListByProcessInstanceIdWithoutCancel(processInstanceId);
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(tasks, item -> Long.valueOf(item.getAssignee())));
- return success(BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePrintData(historicProcessInstance,
+ BpmProcessPrintDataRespVO printData = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePrintData(
+ historicProcessInstance,
processDefinitionService.getProcessDefinitionInfo(historicProcessInstance.getProcessDefinitionId()),
tasks, userMap,
- new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName())));
+ new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName()));
+ // 濉厖涓氬姟闄勪欢閰嶇疆锛屽疄鐜版墦鍗拌嚜鍔ㄥ睍绀哄閮ㄤ笟鍔′俊鎭�
+ businessAttachService.fillBusinessForm(printData.getProcessInstance().getProcessDefinition(),
+ processDefinitionService.getProcessDefinition(historicProcessInstance.getProcessDefinitionId()).getKey(),
+ historicProcessInstance.getBusinessKey());
+ return success(printData);
}
}
--
Gitblit v1.9.3