Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java

@@ -39,12 +39,12 @@ public class CoverageServiceImpl implements CoverageService {
     }
 
     private List<CoverageCategoryResultDTO> categoryList(List<String> coverageTypeList, String customerId) {
-        Stream<CoverageCategoryResultDTO> stream = coverageTypeList.stream().map(categoryType -> {
+        Stream<CoverageCategoryResultDTO> stream = coverageTypeList.stream().map(coverageType -> {
 
             LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
-            query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType);
+            query.eq(IcCoverageCategoryDictEntity::getCoverageType, coverageType);
             query.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId);
-            query.orderByAsc(IcCoverageCategoryDictEntity::getSort);
+            query.orderByAsc(IcCoverageCategoryDictEntity::getPlaceType, IcCoverageCategoryDictEntity::getSort);
             List<IcCoverageCategoryDictEntity> categoriesEntity = coverageCategoryDictDao.selectList(query);
 
             return categoriesEntity.stream().map(e -> {