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 select ${text} as "text", ${code} as "value" - ,iz_enabled as status + ,(case iz_enabled when 'Y' then 0 else 1 end) as status from ${table} 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 impl text = SqlInjectionUtil.getSqlInjectField(text); code = SqlInjectionUtil.getSqlInjectField(code); List 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; }