From 93c7226d536d312fc083a57619629192ba076413 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 12:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
index b443a2b..70092de 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
@@ -14,6 +14,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -42,7 +43,7 @@
*/
@GetMapping("/treeCodeClassifyValue")
public List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) {
- return codeClassifyValueService.treeCodeClassifyValue(treeQueryObject);
+ return codeClassifyValueService.treeCodeClassifyValue(treeQueryObject);
}
/**
@@ -71,7 +72,7 @@
* @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
*/
@PostMapping( "/checkIsCanDelete")
- public R checkIsCanDelete( CodeClassifyValueDTO codeClassifyValueDTO) {
+ public R checkIsCanDelete(CodeClassifyValueDTO codeClassifyValueDTO) {
return codeClassifyValueService.checkIsCanDelete(codeClassifyValueDTO);
}
@@ -81,7 +82,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public R delCodeClassifyValue(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO) {
+ public R delCodeClassifyValue(@Valid @RequestBody CodeClassifyValueDTO codeClassifyValueDTO) {
return codeClassifyValueService.deleteCodeClassifyValue(codeClassifyValueDTO);
}
@@ -130,12 +131,12 @@
CodeClassifyValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeClassifyValueDTO.class);
dtoList.add(codeFixedValueDTO);
}
- String codeclassifysecoid = (String) param.get("codeClassifySecOid");
+ String codeClassifySecOid = (String) param.get("codeClassifySecOid");
VciBaseUtil.alertNotNull(dtoList,"鐮佸�奸泦鍚�");
if (CollectionUtils.isEmpty(dtoList)){
return R.success("");
}
- return codeClassifyValueService.batchSave4Order(dtoList,codeclassifysecoid);
+ return codeClassifyValueService.batchSave4Order(dtoList,codeClassifySecOid);
}
}
--
Gitblit v1.9.3