From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 02 七月 2025 16:43:13 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service --- src/main/java/com/lf/server/service/data/DictService.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lf/server/service/data/DictService.java b/src/main/java/com/lf/server/service/data/DictService.java index aa3af30..c70753f 100644 --- a/src/main/java/com/lf/server/service/data/DictService.java +++ b/src/main/java/com/lf/server/service/data/DictService.java @@ -1,5 +1,6 @@ package com.lf.server.service.data; +import com.lf.server.entity.ctrl.TabEntity; import com.lf.server.entity.data.DictEntity; import com.lf.server.helper.StringHelper; import com.lf.server.mapper.data.DictMapper; @@ -20,7 +21,7 @@ @Override public Integer selectCount(String ns, String tab) { ns = StringHelper.isNull(ns) ? null : ns.trim(); - tab = StringHelper.getLikeStr(tab); + tab = StringHelper.getLikeUpperStr(tab); return dictMapper.selectCount(ns, tab); } @@ -28,19 +29,21 @@ @Override public List<DictEntity> selectByPage(String ns, String tab, Integer limit, Integer offset) { ns = StringHelper.isNull(ns) ? null : ns.trim(); - tab = StringHelper.getLikeStr(tab); + tab = StringHelper.getLikeUpperStr(tab); return dictMapper.selectByPage(ns, tab, limit, offset); } @Override - public List<DictEntity> selectAll() { - return dictMapper.selectAll(); + public DictEntity selectById(int id) { + return dictMapper.selectById(id); } @Override - public DictEntity selectById(int id) { - return dictMapper.selectById(id); + public List<TabEntity> selectDictTab(String name, String field) { + name = StringHelper.getLikeUpperStr(name); + + return dictMapper.selectDictTab(name, field); } @Override -- Gitblit v1.9.3