From 6e64fd7fd77c822aa08f0f3dcee7cc13c66401a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 11 九月 2024 09:27:20 +0800
Subject: [PATCH] !585 修复工作流分页查询不兼容sql server的问题 Merge pull request !585 from 赖小麦/fix_workflow_page_query_error_to_sqlserver
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
index 67e2ec4..176aba2 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
@@ -38,7 +38,7 @@
*/
@GetMapping("/getByDefId/{definitionId}")
public R<WfDefinitionConfigVo> getByDefId(@NotBlank(message = "娴佺▼瀹氫箟ID涓嶈兘涓虹┖")
- @PathVariable String definitionId) {
+ @PathVariable String definitionId) {
return R.ok(wfDefinitionConfigService.getByDefId(definitionId));
}
@@ -63,4 +63,17 @@
@PathVariable Long[] ids) {
return toAjax(wfDefinitionConfigService.deleteByIds(List.of(ids)));
}
+
+ /**
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鎺掗櫎褰撳墠鏌ヨ鐨勬祦绋嬪畾涔�
+ *
+ * @param tableName 琛ㄥ悕
+ * @param definitionId 娴佺▼瀹氫箟id
+ */
+ @GetMapping("/getByTableNameNotDefId/{tableName}/{definitionId}")
+ public R<List<WfDefinitionConfigVo>> getByTableNameNotDefId(@NotBlank(message = "琛ㄥ悕涓嶈兘涓虹┖") @PathVariable String tableName,
+ @NotBlank(message = "娴佺▼瀹氫箟ID涓嶈兘涓虹┖") @PathVariable String definitionId) {
+ return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId));
+ }
+
}
--
Gitblit v1.9.3