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