From 2c1091471c027641d0e73ec7d50a4a0464e86d8f Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 16 七月 2024 16:02:26 +0800
Subject: [PATCH] 修改bug：解析RBD，当参数2、3未设置时，会空指针错误。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/TyProductModelService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 494118a..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
@@ -48,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