From 0fd3470723e2043dfb3355e373e491933db8d47a Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 17 Nov 2025 13:22:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E6=A0=910=E3=80=811=E8=BD=AC=E6=8D=A2=20Y/N=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=202=E3=80=81=E8=A7=A3=E5=86=B3=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B9=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E5=80=BC=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ConfigServiceDirectiveServiceImpl.java     |  8 ++++----
 .../modules/system/mapper/xml/SysDictMapper.xml     |  2 +-
 .../system/service/impl/SysDictServiceImpl.java     | 13 ++++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
index 6cd90e13..ce61f779 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
@@ -409,7 +409,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
         boolean catUsing = true;
         boolean typUsing = true;
         for (InstructionTag inst : instructions) {
-            insUsing = "0".equals(inst.getIzEnabled());
+            insUsing = "Y".equals(inst.getIzEnabled());
             if ("enabled".equals(filterIzEnabled) && !insUsing) {
                 continue;
             }
@@ -418,7 +418,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
             if (catList != null) {
                 catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort));
                 for (ConfigServiceCategory cat : catList) {
-                    catUsing = "0".equals(cat.getIzEnabled());
+                    catUsing = "Y".equals(cat.getIzEnabled());
                     if ("enabled".equals(filterIzEnabled) && !catUsing) {
                         continue;
                     }
@@ -427,7 +427,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                     if (typeList != null) {
                         typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort));
                         for (ConfigServiceType tp : typeList) {
-                            typUsing = "0".equals(tp.getIzEnabled());
+                            typUsing = "Y".equals(tp.getIzEnabled());
                             if ("enabled".equals(filterIzEnabled) && !typUsing) {
                                 continue;
                             }
@@ -436,7 +436,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                             if (dirList != null) {
                                 dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
                                 for (ConfigServiceDirective dir : dirList) {
-                                    if ("enabled".equals(filterIzEnabled) && "1".equals(dir.getIzEnabled())) {
+                                    if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) {
                                         continue;
                                     }
                                     TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,"");
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
index 92734ad0..9017e676 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
@@ -193,7 +193,7 @@
     <sql id="queryTableDictWithFilterSqlFragment">
         select ${text} as "text", ${code} as "value"
         <if test="'1'.equals(ena) || ena == 1 || ena == '1'">
-            ,iz_enabled as status
+            ,(case iz_enabled when 'Y' then 0 else 1 end) as status
         </if>
         from ${table}
         <if test="filterSql != null and filterSql != ''">
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 a4b5893b..5504ee2b 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,13 +300,12 @@ 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);
-//        }
-        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);
+        }
         return dictModels;
     }