From 3ecb68c427a627ad8e90d8c555655e7724be2d96 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 06 九月 2024 11:06:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..5c26cd6 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,13 +13,13 @@
/**
- * ty_product_model
+ * product_model_common
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-02-28
*/
@Service
-public class TyProductModelService extends BaseService<TyProductModelDao, TyProductModel> {
+public class TyProductModelService extends BaseService<TyProductModelDao, TyProductModel> {
/**
* 鍒嗛〉鏌ヨ
@@ -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;
}
/**
@@ -41,20 +42,20 @@
}
public List<TyProductModel> getProductList() {
- List<TyProductModel> ProductList = baseDao.getProductList();
- return ProductList;
+ return baseDao.getProductList();
}
public List<TyProductModel> getAllTree() {
- List<TyProductModel> productList = baseDao.selectList(new QueryWrapper<TyProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).orderByAsc(Constant.TableColumn.SORT));
- return TreeUtils.build(productList);
+ List<TyProductModel> productList = baseDao.selectList(new QueryWrapper<TyProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ 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) {
+ Integer no = baseDao.getNo(pid, nodeType);
+ if (no == null) {
return 0;
}
- return baseDao.getNo(pid);
+ return baseDao.getNo(pid, nodeType);
}
}
--
Gitblit v1.9.1