From e756169368e79863ad3a2459e4a29fa069c10f3d Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Mon, 22 Jun 2020 14:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E7=BB=B4=E6=8A=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/entity/NewsCategoryEntity.java    | 5 +++++
 .../esua/epdc/service/impl/NewsCategoryServiceImpl.java   | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
index e1b43df..649b1d0 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
@@ -53,6 +53,11 @@ public class NewsCategoryEntity extends BaseEpdcEntity {
      */
     private String description;
 
+    /**
+     * 模块编码（数据字典类型function_section_article）
+     */
+    private String sectionCode;
+
     /**
      * 排序
      */
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
index 265d145..ca82c65 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -30,6 +31,7 @@ import com.elink.esua.epdc.dto.NewsCategoryDTO;
 import com.elink.esua.epdc.entity.NewsCategoryEntity;
 import com.elink.esua.epdc.service.NewsCategoryService;
 import com.elink.esua.epdc.service.NewsService;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,11 +70,13 @@ public class NewsCategoryServiceImpl extends BaseServiceImpl<NewsCategoryDao, Ne
     }
 
     private QueryWrapper<NewsCategoryEntity> getWrapper(Map<String, Object> params) {
-        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String sectionCode = MapUtils.getString(params,"sectionCode");
+        String id = MapUtils.getString(params,FieldConstant.ID_HUMP);
 
         QueryWrapper<NewsCategoryEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.orderByDesc("SORT");
+        wrapper.eq(StringUtils.isNotBlank(sectionCode), "SECTION_CODE", sectionCode);
+        wrapper.orderByAsc("SORT");
 
         return wrapper;
     }