From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 7 ++++++-
1 files changed, 6 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 0391dd7..974d007 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
@@ -140,7 +140,7 @@
ParamData data =new ParamData();
data.setShipId(id);
data.setProductId(id);
- data.setPageCode("expect");
+
paramDataService.insert(data);
}
@@ -156,6 +156,11 @@
xhProductModel.setId(null);
xhProductModel.setSort(xhProductModel.getSort());
xhProductModel.setProductType(xhProductModel.getNodeType());
+ if (xhProductModel.getNamePath()==null){
+ xhProductModel.setNamePath(xhProductModel.getName());
+ }else{
+ xhProductModel.setNamePath(xhProductModel.getNamePath()+","+xhProductModel.getName());
+ }
this.insert(xhProductModel);
}
return Result.ok();
--
Gitblit v1.9.1