From 812d77e3db062d63bc35304ac527f14efd1a454d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 三月 2024 11:12:18 +0800
Subject: [PATCH] 修改

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

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 583c14f..a5c1c22 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -12,6 +12,7 @@
 import com.zt.modules.sys.model.SysMenu;
 import org.springframework.stereotype.Service;
 import com.zt.common.db.query.QueryFilter;
+
 import javax.annotation.Resource;
 import java.util.List;
 
@@ -19,11 +20,11 @@
 /**
  * product_model
  *
- * @author zt generator 
+ * @author zt generator
  * @since 1.0.0 2024-02-29
  */
 @Service
-public class XhProductModelService  extends BaseService<XhProductModelDao, XhProductModel> {
+public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
 
     /**
      * 鍒嗛〉鏌ヨ
@@ -32,7 +33,8 @@
      * @return
      */
     public List<XhProductModel> page(QueryFilter queryFilter) {
-        return baseDao.getList(queryFilter.getQueryParams());
+        List<XhProductModel> list = baseDao.getList(queryFilter.getQueryParams());
+        return list;
     }
 
     /**
@@ -45,17 +47,18 @@
     }
 
     public List<XhProductModel> getAllTree() {
-            List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
-                    Constant.Bool.NO) .gt("node_type", 1).orderByAsc(Constant.TableColumn.SORT));
-            return TreeUtils.build(productList);
+        List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+        return TreeUtils.build(productList);
     }
 
     public Integer getNo(Long pid) {
-        if (baseDao.getNo(pid) == null){
+        if (baseDao.getNo(pid) == null) {
             return 0;
         }
         return baseDao.getNo(pid);
     }
+
     public List<XhProductModel> getProductList() {
         List<XhProductModel> ProductList = baseDao.getProductList();
         return TreeUtils.build(ProductList);
@@ -64,4 +67,8 @@
     public List<ProductImg> getProduct(Long productId) {
         return baseDao.getProduct(productId);
     }
+
+    public List<XhProductModel> getTaskProductList() {
+        return baseDao.getTaskProductList();
+    }
 }

--
Gitblit v1.9.1