diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java index 42a74ba1..246d136d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java @@ -14,10 +14,9 @@ import java.util.Set; @Mapper public interface DictDetailMapper extends BaseMapper { + List findDictDetailByDictName(@Param("name") String name); - List selectByDictName(@Param("name") String name); + IPage findDictDetail(@Param("criteria") DictDetailQueryCriteria criteria, Page page); - IPage selectByPage(@Param("criteria") DictDetailQueryCriteria criteria, Page page); - - void deleteBatchByDictIds(@Param("dictIds") Set dictIds); + void deleteDictDetailsByDictIds(@Param("dictIds") Set dictIds); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java index 3922eba7..d3bd7484 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java @@ -29,7 +29,7 @@ public class DictDetailServiceImpl extends ServiceImpl queryAll(DictDetailQueryCriteria criteria, Page page) { - return PageUtil.toPage(dictDetailMapper.selectByPage(criteria, page)); + return PageUtil.toPage(dictDetailMapper.findDictDetail(criteria, page)); } @Override @@ -57,7 +57,7 @@ public class DictDetailServiceImpl extends ServiceImpl dictDetails = redisUtil.getList(key, DictDetail.class); if (CollUtil.isEmpty(dictDetails)) { - dictDetails = dictDetailMapper.selectByDictName(name); + dictDetails = dictDetailMapper.findDictDetailByDictName(name); redisUtil.set(key, dictDetails, 1, TimeUnit.DAYS); } return dictDetails; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java index 26827d3b..08957ab8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java @@ -69,14 +69,14 @@ public class DictServiceImpl extends ServiceImpl implements Di // 删除字典 dictMapper.deleteBatchIds(ids); // 删除字典详情 - dictDetailMapper.deleteBatchByDictIds(ids); + dictDetailMapper.deleteDictDetailsByDictIds(ids); } @Override public void download(List dicts, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (Dict dict : dicts) { - List dictDetails = dictDetailMapper.selectByDictName(dict.getName()); + List dictDetails = dictDetailMapper.findDictDetailByDictName(dict.getName()); if (CollectionUtil.isNotEmpty(dictDetails)) { for (DictDetail dictDetail : dictDetails) { Map map = new LinkedHashMap<>(); diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml index ae38af9e..834287b0 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml @@ -17,7 +17,18 @@ - + select + dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, + d.id as dict_id, d.name + from sys_dict_detail dd, sys_dict d + where dd.dict_id = d.id + + and d.name = #{name} + + order by dd.dict_sort + + - - - - + delete from sys_dict_detail where dict_id in