From f2da5449cf593ef3cbb3f6b65071f79e88cf6ad3 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 9 Dec 2025 13:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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{