From d8c24ee1a944eb75ef014b2d8be527b31a56581d Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 20 Mar 2025 10:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2sql:=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8iz=5Fenabled=E5=AD=97=E6=AE=B5=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=AD=98=E5=9C=A8=E5=88=99=E5=B8=A6=E4=B8=8A=20?= =?UTF-8?q?=E9=81=BF=E5=85=8Dtry=20catch=E6=8B=A6=E6=88=AA=E6=97=B6?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E4=BB=8D=E7=84=B6=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/utils/PinyinUtils.java | 2 +- .../modules/system/mapper/SysDictMapper.java | 2 + .../system/mapper/xml/SysDictMapper.xml | 470 +++++++++--------- .../service/impl/SysDictServiceImpl.java | 24 +- 4 files changed, 262 insertions(+), 236 deletions(-) diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java index c371526..ac8fd96 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java @@ -1,11 +1,11 @@ package com.nu.modules.utils; + import lombok.extern.slf4j.Slf4j; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; -import org.springframework.stereotype.Component; @Slf4j public class PinyinUtils { diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index c526d89..9f99029 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -214,4 +214,6 @@ public interface SysDictMapper extends BaseMapper { * @return */ int removeLogicDeleted(@Param("ids")List ids); + + int existColumn(@Param("tableName") String tableName, @Param("columnName") String columnName); } 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 a5d935d..92734ad 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 @@ -2,248 +2,268 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} - - - + + + SELECT COUNT(1) + FROM ${tableName} + WHERE ${fieldName} = #{fieldVal} + + + - - + + - - + + - - - select ${text} as "text", ${code} as "value" - - ,iz_enabled as status - - from ${table} - - where ${filterSql} - - - - - - + + + select ${text} as "text", ${code} as "value" + + ,iz_enabled as status + + from ${table} + + where ${filterSql} + + + + + + - - + + - + - - + + + - - - UPDATE - sys_dict - SET - del_flag = 0 - WHERE - del_flag = 1 - AND id IN - - #{dictId} - - + + + UPDATE + sys_dict + SET + del_flag = 0 + WHERE + del_flag = 1 + AND id IN + + #{dictId} + + - - - DELETE FROM sys_dict - WHERE - del_flag = 1 - AND id IN - - #{dictId} - - + + + DELETE FROM sys_dict + WHERE + del_flag = 1 + AND id IN + + #{dictId} + + 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 d4f9a9a..15b09d0 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 @@ -268,9 +268,10 @@ public class SysDictServiceImpl extends ServiceImpl impl text = SqlInjectionUtil.getSqlInjectField(text); code = SqlInjectionUtil.getSqlInjectField(code); List dictModels = Lists.newArrayList(); - try { + int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled"); + if(existIzEnabled>0){ dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1"); - } catch (Exception e) { + }else{ dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null); } return dictModels; @@ -299,9 +300,10 @@ public class SysDictServiceImpl extends ServiceImpl impl text = SqlInjectionUtil.getSqlInjectField(text); code = SqlInjectionUtil.getSqlInjectField(code); List dictModels = Lists.newArrayList(); - try { + int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled"); + if(existIzEnabled>0){ dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1"); - } catch (Exception e) { + }else{ dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null); } return dictModels; @@ -540,10 +542,11 @@ public class SysDictServiceImpl extends ServiceImpl impl // 3. 返回表字典数据 IPage pageList = new Page<>(); - try { - pageList = baseMapper.queryPageTableDictWithFilter(page, table, text, code, filterSql, "1"); - } catch (Exception e) { - pageList = baseMapper.queryPageTableDictWithFilter(page, table, text, code, filterSql, null); + int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled"); + if(existIzEnabled>0){ + pageList = baseMapper.queryPageTableDictWithFilter(page,table, text, code, filterSql, "1"); + }else{ + pageList = baseMapper.queryPageTableDictWithFilter(page,table, text, code, filterSql, null); } return pageList.getRecords(); } @@ -637,9 +640,10 @@ public class SysDictServiceImpl extends ServiceImpl impl text = SqlInjectionUtil.getSqlInjectField(text); code = SqlInjectionUtil.getSqlInjectField(code); List ls = Lists.newArrayList(); - try { + int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled"); + if(existIzEnabled>0){ ls = baseMapper.queryTableDictWithFilter(table, text, code, filterSql, "1"); - } catch (Exception e) { + }else{ ls = baseMapper.queryTableDictWithFilter(table, text, code, filterSql, null); } return ls;