From d9b3b4b0ad0f4022cbb406a9fb3ad56a5e7f7ff3 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:31:33 +0800
Subject: [PATCH] 修改仿真

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
index a61252c..76f7555 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java
@@ -13,7 +13,7 @@
 
 
 /**
- * ty_product_model
+ * product_model_common
  *
  * @author zt generator 
  * @since 1.0.0 2024-02-28
@@ -28,7 +28,8 @@
      * @return
      */
     public List<TyProductModel> page(QueryFilter queryFilter) {
-        return baseDao.getList(queryFilter.getQueryParams());
+        List<TyProductModel> list =baseDao.getList(queryFilter.getQueryParams());
+        return list ;
     }
 
     /**
@@ -47,14 +48,14 @@
 
     public List<TyProductModel> getAllTree() {
             List<TyProductModel> productList = baseDao.selectList(new QueryWrapper<TyProductModel>().eq(Constant.TableColumn.IS_DELETE,
-                    Constant.Bool.NO).orderByAsc(Constant.TableColumn.SORT));
+                    Constant.Bool.NO).orderByAsc("node_type").orderByAsc(Constant.TableColumn.SORT));
             return TreeUtils.build(productList);
     }
 
-    public Integer getNo(Long pid) {
-        if (baseDao.getNo(pid) == null){
+    public Integer getNo(Long pid, String nodeType) {
+        if (baseDao.getNo(pid,nodeType) == null){
             return 0;
         }
-        return baseDao.getNo(pid);
+        return baseDao.getNo(pid,nodeType);
     }
 }

--
Gitblit v1.9.1