yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、服务指令树0、1转换 Y/N 调整 

2、解决字典项查询返回值类型不匹配问题
This commit is contained in:
1378012178@qq.com 2025-11-17 13:22:34 +08:00
parent 577f476433
commit 0fd3470723
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -409,7 +409,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
boolean catUsing = true; boolean catUsing = true;
boolean typUsing = true; boolean typUsing = true;
for (InstructionTag inst : instructions) { for (InstructionTag inst : instructions) {
insUsing = "0".equals(inst.getIzEnabled()); insUsing = "Y".equals(inst.getIzEnabled());
if ("enabled".equals(filterIzEnabled) && !insUsing) { if ("enabled".equals(filterIzEnabled) && !insUsing) {
continue; continue;
} }
@ -418,7 +418,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
if (catList != null) { if (catList != null) {
catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort)); catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort));
for (ConfigServiceCategory cat : catList) { for (ConfigServiceCategory cat : catList) {
catUsing = "0".equals(cat.getIzEnabled()); catUsing = "Y".equals(cat.getIzEnabled());
if ("enabled".equals(filterIzEnabled) && !catUsing) { if ("enabled".equals(filterIzEnabled) && !catUsing) {
continue; continue;
} }
@ -427,7 +427,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
if (typeList != null) { if (typeList != null) {
typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort)); typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort));
for (ConfigServiceType tp : typeList) { for (ConfigServiceType tp : typeList) {
typUsing = "0".equals(tp.getIzEnabled()); typUsing = "Y".equals(tp.getIzEnabled());
if ("enabled".equals(filterIzEnabled) && !typUsing) { if ("enabled".equals(filterIzEnabled) && !typUsing) {
continue; continue;
} }
@ -436,7 +436,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
if (dirList != null) { if (dirList != null) {
dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort)); dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
for (ConfigServiceDirective dir : dirList) { for (ConfigServiceDirective dir : dirList) {
if ("enabled".equals(filterIzEnabled) && "1".equals(dir.getIzEnabled())) { if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) {
continue; 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,""); 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,"");

2
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
View File

@ -193,7 +193,7 @@
<sql id="queryTableDictWithFilterSqlFragment"> <sql id="queryTableDictWithFilterSqlFragment">
select ${text} as "text", ${code} as "value" select ${text} as "text", ${code} as "value"
<if test="'1'.equals(ena) || ena == 1 || ena == '1'"> <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> </if>
from ${table} from ${table}
<if test="filterSql != null and filterSql != ''"> <if test="filterSql != null and filterSql != ''">

13
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
View File

@ -300,13 +300,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
text = SqlInjectionUtil.getSqlInjectField(text); text = SqlInjectionUtil.getSqlInjectField(text);
code = SqlInjectionUtil.getSqlInjectField(code); code = SqlInjectionUtil.getSqlInjectField(code);
List<DictModel> dictModels = Lists.newArrayList(); List<DictModel> dictModels = Lists.newArrayList();
// int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled"); int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
// if(existIzEnabled>0){ if(existIzEnabled>0){
// dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1"); dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
// }else{ }else{
// dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null); dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
// } }
dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
return dictModels; return dictModels;
} }