diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index ae588bf1..c2281a21 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1337,7 +1337,12 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("wl_id",nuWarehouseMaterialCrkInfo.getWlId()); queryWrapper.eq("nu_id",nuWarehouseMaterialCrkInfo.getNuId()); - queryWrapper.in("crk_status",1,3); + if(StringUtils.isNotBlank(crkInfoEntity.getCrkStatus())){ + queryWrapper.in("crk_status",crkInfoEntity.getCrkStatus()); + }else{ + queryWrapper.in("crk_status",1,3); + } + if(StringUtils.equals("asc",colomnDesc)){ queryWrapper.orderByAsc("create_time"); }else{