From 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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