From 8c834663344b1cc9c2ca569e6911900edd407f73 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 06 六月 2024 16:44:14 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 b4bbeef..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
@@ -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