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..b3f79c64a 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 - * + *

* 版权所有,侵权必究! */ @@ -10,12 +10,10 @@ 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.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SysDictDao; import com.elink.esua.epdc.dto.SysDictDTO; @@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -48,12 +47,10 @@ public class SysDictServiceImpl extends BaseServiceImpl page(Map params) { - QueryWrapper wrapper = getWrapper(params); - wrapper.eq("pid", Constant.DICT_ROOT); IPage page = baseDao.selectPage( - getPage(params, "sort", true), - wrapper + getPage(params, "sort", true), + getWrapper(params) ); return getPageData(page, SysDictDTO.class); @@ -72,14 +69,13 @@ 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"); String dictValue = (String) params.get("dictValue"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value()); wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid)); wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType); wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName); @@ -115,14 +111,14 @@ public class SysDictServiceImpl extends BaseServiceImpl