From d0e1a3fb24d0ee76aa4ef1b0e042392b4d3ac794 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十一月 2024 16:38:26 +0800
Subject: [PATCH] 预计参数多层次分级,新增型号增加namePath

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |    9 ++++++++-
 1 files changed, 8 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..07f6d0b 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,7 +171,7 @@
 
             paramDataService.insert(data);
         }
-
+        xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
         xhProductModelService.insert(xhProductModel);
         Map<Long, XhProductModel> imgMap = new HashMap<>();
         imgMap = (Map<Long, XhProductModel>) CacheUtils.get("sysImgCache", "sysImgCache");

--
Gitblit v1.9.1