From 9da3d25292f4d5f6f831a2e67757b3a5cdab1cc5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 06 十一月 2024 15:40:32 +0800
Subject: [PATCH] !595 修复大数量级联下拉导致的禁止写入错误 Merge pull request !595 from Emil.Zhang/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 d3388d4..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
@@ -17,7 +17,7 @@
import org.dromara.workflow.service.IWfDefinitionConfigService;
/**
- * 琛ㄥ崟閰嶇疆
+ * 娴佺▼瀹氫箟閰嶇疆
*
* @author may
* @date 2024-03-18
@@ -32,20 +32,20 @@
/**
- * 鑾峰彇琛ㄥ崟閰嶇疆璇︾粏淇℃伅
+ * 鑾峰彇娴佺▼瀹氫箟閰嶇疆璇︾粏淇℃伅
*
* @param definitionId 涓婚敭
*/
@GetMapping("/getByDefId/{definitionId}")
public R<WfDefinitionConfigVo> getByDefId(@NotBlank(message = "娴佺▼瀹氫箟ID涓嶈兘涓虹┖")
- @PathVariable String definitionId) {
+ @PathVariable String definitionId) {
return R.ok(wfDefinitionConfigService.getByDefId(definitionId));
}
/**
- * 鏂板琛ㄥ崟閰嶇疆
+ * 鏂板娴佺▼瀹氫箟閰嶇疆
*/
- @Log(title = "琛ㄥ崟閰嶇疆", businessType = BusinessType.INSERT)
+ @Log(title = "娴佺▼瀹氫箟閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/saveOrUpdate")
public R<Void> saveOrUpdate(@Validated(AddGroup.class) @RequestBody WfDefinitionConfigBo bo) {
@@ -53,14 +53,27 @@
}
/**
- * 鍒犻櫎琛ㄥ崟閰嶇疆
+ * 鍒犻櫎娴佺▼瀹氫箟閰嶇疆
*
* @param ids 涓婚敭涓�
*/
- @Log(title = "琛ㄥ崟閰嶇疆", businessType = BusinessType.DELETE)
+ @Log(title = "娴佺▼瀹氫箟閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@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