修改

jinlin

2024-04-02 5c1e5b08d28251186e99cf5e24c5114c404dc968

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -6,14 +6,10 @@
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
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;


@@ -46,9 +42,16 @@
        super.deleteLogic(ids);
    }

    public List<XhProductModel> getAllTree() {
        List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
    public List<XhProductModel> getAllTree(Boolean showXdy) {
        List<XhProductModel> productList;
        if (showXdy) {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
        } else {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));

        }
        return TreeUtils.build(productList);
    }