From 089b302259e03ce52fc102bcf168d1fa048fffe9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 26 九月 2024 16:38:28 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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..e9b3576 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();
@@ -178,9 +183,25 @@
     public Result delete(@RequestBody Long[] ids) {
         //鏁堥獙鏁版嵁
         AssertUtils.isArrayEmpty(ids, "id");
-        xhProductModelService.delete(ids);
+        this.deleteByProduct(ids);
 
         return Result.ok();
     }
 
+    private void deleteByProduct(Long[] ids){
+        for(Long id : ids){
+            XhProductModel data = xhProductModelService.get(id);
+            if (data.getProductType().equals("1")||data.getProductType().equals("3")||data.getProductType().equals("4")){
+                xhProductModelService.deleteLogic(id);
+              /*  List<Long> list =xhProductModelService.getByPid(id);
+                Long[] L = list.stream().toArray(Long[]::new);*/
+                Long[] list =xhProductModelService.getByPid(id);
+                this.deleteByProduct(list);
+            }else if(data.getProductType().equals("2")){
+                xhProductModelService.deleteByShipId(data.getShipId());
+            }else if(data.getProductType().equals("5")){
+                xhProductModelService.deleteLogic(id);
+            }
+        }
+    }
 }

--
Gitblit v1.9.1