From 25da36be2318c1247592dce7d499d0b985c80fe0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 03 十二月 2023 23:07:03 +0800
Subject: [PATCH] 历史数据导入时，赋默认值报空指针异常bug修复
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
index 0ffc334..9b44d22 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
@@ -18,6 +18,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;
@@ -48,9 +49,9 @@
*/
@GetMapping("/gridCodeFixedValue")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "CodeFixedValueVO")
+ @ApiOperation(value = "鍥哄畾鐮佹鐨勭爜鍊煎垪琛�", notes = "CodeFixedValueVO")
public R<IPage<CodeFixedValueVO>> gridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
- return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("ordernum"))));
+ return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("orderNum"))));
}
/**
@@ -81,7 +82,7 @@
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
@DeleteMapping( "/deleteData")
- public R delCodeFixedValue(@RequestBody CodeFixedValueDTO codeFixedValueDTO) {
+ public R delCodeFixedValue(@Valid @RequestBody CodeFixedValueDTO codeFixedValueDTO) {
return codeFixedValueService.deleteCodeFixedValue(codeFixedValueDTO);
}
@@ -131,7 +132,7 @@
dtoList.add(codeFixedValueDTO);
}
String codefixedsecoid = (String) param.get("codeFixedSecOid");
- VciBaseUtil.alertNotNull(dtoList,"鐮佸�煎璞￠泦鍚�",codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
+ VciBaseUtil.alertNotNull(codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
if (CollectionUtils.isEmpty(dtoList)){
return R.status(codeFixedValueService.batchDeleteBySecOid(codefixedsecoid));
}
--
Gitblit v1.9.3