From d8f5eee59f55cd532f444371b247cff712d63682 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 6 Sep 2019 16:56:12 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b066cb213abd14f8712e25111fcad623fa6daf7e.
---
 .../epdc/service/impl/SysDictServiceImpl.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

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 f415722c7..c98e332e1 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.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -11,7 +11,6 @@ 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;
@@ -53,8 +52,8 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
         wrapper.eq("pid", Constant.DICT_ROOT);
 
         IPage<SysDictEntity> page = baseDao.selectPage(
-                getPage(params, "sort", true),
-                wrapper
+            getPage(params, "sort", true),
+            wrapper
         );
 
         return getPageData(page, SysDictDTO.class);
@@ -73,7 +72,7 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
         return ConvertUtils.sourceToTarget(entityList, SysDictDTO.class);
     }
 
-    private QueryWrapper<SysDictEntity> getWrapper(Map<String, Object> params) {
+    private QueryWrapper<SysDictEntity> getWrapper(Map<String, Object> params){
         String pid = (String) params.get("pid");
         String dictType = (String) params.get("dictType");
         String dictName = (String) params.get("dictName");
@@ -139,12 +138,11 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
                 }
 
                 QueryWrapper<SysDictEntity> sdWrapper = new QueryWrapper<>();
-                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);
+                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);
                 List<SysDictEntity> entityList = baseDao.selectList(sdWrapper);
                 if (!entityList.isEmpty()) {
                     simpleDictList = ConvertUtils.sourceToTarget(entityList, SysSimpleDictDTO.class);