【五大图层】查询客户下的类别接口调整

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 -->

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
      */

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 -> {