1/26
This commit is contained in:
@@ -116,7 +116,7 @@
|
|||||||
<if test="query.brandId!=null and query.brandId!=''">
|
<if test="query.brandId!=null and query.brandId!=''">
|
||||||
and brandId =#{query.brandId}
|
and brandId =#{query.brandId}
|
||||||
</if>
|
</if>
|
||||||
<if test="query.categoryId!=null and query.categoryId!=''">
|
<if test="query.categoryId!=null and query.categoryId!='' and query.categoryId!=0 ">
|
||||||
and categoryId=#{query.categoryId}
|
and categoryId=#{query.categoryId}
|
||||||
</if>
|
</if>
|
||||||
<if test="query.name!=null and query.name!=''">
|
<if test="query.name!=null and query.name!=''">
|
||||||
|
|||||||
@@ -247,6 +247,10 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
|
|||||||
ResultBean rb=new ResultBean().fail();
|
ResultBean rb=new ResultBean().fail();
|
||||||
GoodsTypeVo vo=new GoodsTypeVo();
|
GoodsTypeVo vo=new GoodsTypeVo();
|
||||||
List<GoodsTypeVo> list=baseMapper.getType();
|
List<GoodsTypeVo> list=baseMapper.getType();
|
||||||
|
GoodsTypeVo vo1=new GoodsTypeVo();
|
||||||
|
vo1.setName("全部分类");
|
||||||
|
vo1.setId("0");
|
||||||
|
list.add(0,vo1);
|
||||||
vo.setTypeVos(list);
|
vo.setTypeVos(list);
|
||||||
List<BrandVo> list1= IPmsBrandService.getList().getData();
|
List<BrandVo> list1= IPmsBrandService.getList().getData();
|
||||||
vo.setBrandVos(list1);
|
vo.setBrandVos(list1);
|
||||||
|
|||||||
Reference in New Issue
Block a user