From 3c15e684416e06a7351eeb2d756e5be778a893fd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 17 七月 2024 10:37:23 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index f2df87c..1d709b7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -63,8 +63,8 @@
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList(Boolean showXdy,Integer ztShow) {
- List<XhProductModel> list = xhProductModelService.getAllTree(showXdy,ztShow);
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow);
return Result.ok(list);
}
@@ -100,10 +100,10 @@
@PostMapping("importProductExcel")
@ApiOperation("瀵煎叆浜у搧妯″瀷")
@LogOperation("瀵煎叆浜у搧妯″瀷")
- public Result importProductExcel(MultipartFile file, String progressId,Long pid) {
+ public Result importProductExcel(MultipartFile file, String progressId, Long pid) {
Result<List<ImportErrDto>> result = Result.ok();
try {
- List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file,progressId,pid);
+ List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file, progressId, pid);
StringBuilder str = new StringBuilder();
ImportUtil.importResult(result, importResults, str);
ImportUtil.ImportErrResult(result, importResults, str);
@@ -122,8 +122,8 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);
- Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
- if (xhProductModel.getSort() < no) {
+ Integer no = xhProductModelService.getNo(xhProductModel.getPid(), xhProductModel.getProductType());
+ if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
xhProductModel.setSort(no + 1);
}
xhProductModelService.insert(xhProductModel);
--
Gitblit v1.9.1