diff --git a/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java b/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java index 177f761..665efe2 100644 --- a/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java +++ b/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java @@ -20,6 +20,7 @@ public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, Recei public List<Map<String, Object>> getType(){ LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode()) + .eq(ReceiptType::getEnable,true) .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList()); List<Map<String, Object>> list = this.listMaps(lambdaQueryWrapper); return list; diff --git a/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java index 139aa30..c464ac6 100644 --- a/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java +++ b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java @@ -58,6 +58,7 @@ public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, Shi public List<Map<String, Object>> getType(){ LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery(); lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode()) + .eq(ShipmentType::getEnable,true) .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList()); return this.listMaps(lambdaQueryWrapper); }