diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java index 18222fc..1b2d2dc 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java @@ -61,14 +61,14 @@ public class GearProductVo { * 产品类型(product=产品,semi=半成品,raw=原料) */ @ExcelProperty(value = "产品类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "p=roduct=产品,semi=半成品,raw=原料") + @ExcelDictFormat(readConverterExp = "product=产品,semi=半成品,raw=原料") private String type; /** * 是否启用(0=否,1=是) */ @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0==否,1=是") + @ExcelDictFormat(readConverterExp = "0=否,1=是") private Integer isEnabled; /** @@ -86,7 +86,6 @@ public class GearProductVo { //新增图像字段 private String image; // 分类名称 - @ExcelProperty(value = "分类名称") private String categoryName; } diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java index 8973114..b2ef6ee 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java @@ -92,7 +92,7 @@ public class GearProductServiceImpl implements IGearProductService { */ @Override public List queryList(GearProductBo bo) { - QueryWrapper lqw = buildQueryWrapperPlus(bo); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); }