From 2d6c0d1cffe663b3b37ef7e0575cfe6e11d8fd85 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 18 十一月 2024 09:13:56 +0800
Subject: [PATCH] 修复bug:点击一键排版会自动保存

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 f515f52..1285419 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
@@ -105,7 +105,14 @@
 
     @GetMapping("getProductList")
     public Result<List<XhProductModel>> getProductList(Long shipId, Integer productType) {
+        if(productType==2){
+            shipId =null;
+        }
         List<XhProductModel> list = xhProductModelService.getProductList(shipId, productType - 1);
+        if(productType == 5){
+            List<XhProductModel> list2 =  xhProductModelService.getProductList(shipId, productType - 2);
+            list.addAll(list2);
+        }
         return Result.ok(list);
     }
 
@@ -164,8 +171,12 @@
 
             paramDataService.insert(data);
         }
-
+        xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
         xhProductModelService.insert(xhProductModel);
+        ParamData data = new ParamData();
+        data.setShipId(xhProductModel.getShipId());
+        data.setProductId(xhProductModel.getId());
+        paramDataService.insert(data);
         Map<Long, XhProductModel> imgMap = new HashMap<>();
         imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");
         imgMap.put(xhProductModel.getId(), xhProductModel);

--
Gitblit v1.9.1