From 0b0c5d00b63b6ad466d7182ae04375992500c435 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Mon, 20 Jun 2022 10:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E3=80=91=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-org/gov-org-server/pom.xml       |  4 ++--
 .../com/epmet/controller/CoverageController.java  |  2 +-
 .../epmet/service/impl/CoverageServiceImpl.java   | 15 ++++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 5efca9400d..b4a6ef92e1 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -243,13 +243,13 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.150.119:43306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>localhost</spring.redis.host>
+                <spring.redis.host>192.168.1.140</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java
index 559e2f103a..26483f353b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java
@@ -23,7 +23,7 @@ public class CoverageController {
     private CoverageService coverageService;
 
     /**
-     * 类别列表
+     * 根据图层列表查询图层下的类别列表。按照图层传递顺序一级排序，sort二级排序
      * @param form
      * @return
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java
index e6c71a0f61..eeafb95080 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java
@@ -1,10 +1,12 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dao.IcCoverageCategoryDictDao;
 import com.epmet.dto.result.CoverageCategoryResultDTO;
 import com.epmet.entity.IcCoverageCategoryDictEntity;
 import com.epmet.service.CoverageService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,11 +28,22 @@ public class CoverageServiceImpl implements CoverageService {
      */
     @Override
     public List<CoverageCategoryResultDTO> categoryList(List<String> coverageTypeList) {
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        List<CoverageCategoryResultDTO> categoryList = categoryList(coverageTypeList, customerId);
+        if (CollectionUtils.isNotEmpty(categoryList)) {
+            return categoryList;
+        }
+        return categoryList(coverageTypeList, "default");
+
+    }
+
+    private List<CoverageCategoryResultDTO> categoryList(List<String> coverageTypeList, String customerId) {
         Stream<CoverageCategoryResultDTO> stream = coverageTypeList.stream().map(categoryType -> {
 
             LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
             query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType);
-            query.orderByAsc(IcCoverageCategoryDictEntity::getCreatedTime);
+            query.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId);
+            query.orderByAsc(IcCoverageCategoryDictEntity::getSort);
             List<IcCoverageCategoryDictEntity> categoriesEntity = coverageCategoryDictDao.selectList(query);
 
             return categoriesEntity.stream().map(e -> {