Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/table/TableDataSelectServiceImpl.java

@@ -659,6 +659,12 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
 
     @Override
     public List<TableLayerDTO> dataQueryLayer(String defaultType, String layerId) {
+        List<TableLayerDTO> retList = new ArrayList<>();
+        if (StringUtils.isNotBlank(layerId)) {
+            QueryWrapper<TableLayerDTO> queryTableLayerWrapper = new QueryWrapper<>();
+            queryTableLayerWrapper.eq("layer_id", layerId);
+            retList = tableLayerMapper.selectList(queryTableLayerWrapper);
+        }
         QueryWrapper<TableLayerDTO> queryTableLayerWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(defaultType)) {
             queryTableLayerWrapper.eq("default_type", defaultType);
@@ -668,6 +674,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         }
         queryTableLayerWrapper.eq("pid", "0");
         queryTableLayerWrapper.orderByAsc("sort");
-        return tableLayerMapper.selectList(queryTableLayerWrapper);
+        retList.addAll(tableLayerMapper.selectList(queryTableLayerWrapper));
+        return retList;
     }
 }