From 8b44f5cdbc947529bc3552cceeae64b354687c08 Mon Sep 17 00:00:00 2001
From: sushuai <sushuai@tsugami.com.cn>
Date: 星期二, 10 九月 2024 12:05:08 +0800
Subject: [PATCH] 修复：工作流中（我的待办、我的已办、我的抄送默认）的分页查询语句不兼容sqlserver的问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
index eb09d4f..5198bd1 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
@@ -2,6 +2,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -83,14 +84,14 @@
/**
* 鍒犻櫎娴佺▼瀹氫箟
*
- * @param deploymentId 閮ㄧ讲id
- * @param processDefinitionId 娴佺▼瀹氫箟id
+ * @param deploymentIds 閮ㄧ讲id
+ * @param processDefinitionIds 娴佺▼瀹氫箟id
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deploymentId}/{processDefinitionId}")
- public R<Void> deleteDeployment(@NotBlank(message = "娴佺▼閮ㄧ讲id涓嶈兘涓虹┖") @PathVariable String deploymentId,
- @NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
- return toAjax(actProcessDefinitionService.deleteDeployment(deploymentId, processDefinitionId));
+ @DeleteMapping("/{deploymentIds}/{processDefinitionIds}")
+ public R<Void> deleteDeployment(@NotNull(message = "娴佺▼閮ㄧ讲id涓嶈兘涓虹┖") @PathVariable List<String> deploymentIds,
+ @NotNull(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable List<String> processDefinitionIds) {
+ return toAjax(actProcessDefinitionService.deleteDeployment(deploymentIds, processDefinitionIds));
}
/**
--
Gitblit v1.9.3