From 577f476433b18beb415055ef632f2c06dce8509b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 17 Nov 2025 11:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E7=85=A7=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NuInvoicingCgdMainServiceImpl.java | 10 ++++++++--
 .../system/service/impl/SysDictServiceImpl.java     | 13 +++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

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 1d2209b..a3a0d0a 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
@@ -351,8 +351,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType()),"cgd_type",cgdMainEntityDto.getCgdType());
+//        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
+        if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
+            if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
+                queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(","));
+            }else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){
+                queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
+            }
+        }
         Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
         List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
         IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
index 5504ee2..a4b5893 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -300,12 +300,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         text = SqlInjectionUtil.getSqlInjectField(text);
         code = SqlInjectionUtil.getSqlInjectField(code);
         List<DictModel> dictModels = Lists.newArrayList();
-        int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
-        if(existIzEnabled>0){
-            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
-        }else{
-            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
-        }
+//        int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
+//        if(existIzEnabled>0){
+//            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
+//        }else{
+//            dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
+//        }
+        dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
         return dictModels;
     }