Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 c80aedf517205fd50e608efc17ead73a3667d506

 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);
    }
}