diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java index c98e332e1..f415722c7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有,侵权必究! */ @@ -11,6 +11,7 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum; +import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -52,8 +53,8 @@ public class SysDictServiceImpl extends BaseServiceImpl page = baseDao.selectPage( - getPage(params, "sort", true), - wrapper + getPage(params, "sort", true), + wrapper ); return getPageData(page, SysDictDTO.class); @@ -72,7 +73,7 @@ public class SysDictServiceImpl extends BaseServiceImpl getWrapper(Map params){ + private QueryWrapper getWrapper(Map params) { String pid = (String) params.get("pid"); String dictType = (String) params.get("dictType"); String dictName = (String) params.get("dictName"); @@ -138,11 +139,12 @@ public class SysDictServiceImpl extends BaseServiceImpl sdWrapper = new QueryWrapper<>(); - sdWrapper.select("dict_value", "dict_name"); - sdWrapper.eq("dict_type", dictType); - sdWrapper.ne("dict_value", ""); - sdWrapper.isNotNull("dict_value"); - sdWrapper.orderByAsc("SORT", Constant.CREATE_DATE); + sdWrapper.select("dict_value", "dict_name") + .eq(Constant.DEL_FLAG, EpdcDelFlagEnum.NORMAL.value()) + .eq("dict_type", dictType) + .ne("dict_value", "") + .isNotNull("dict_value") + .orderByAsc("SORT", Constant.CREATE_DATE); List entityList = baseDao.selectList(sdWrapper); if (!entityList.isEmpty()) { simpleDictList = ConvertUtils.sourceToTarget(entityList, SysSimpleDictDTO.class);