修改

src/main/java/com/steerinfo/dil/controller/RmsDirectlySentCityController.java

@@ -46,6 +46,9 @@ public class RmsDirectlySentCityController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsDirectlySentCityService.getDirectlySentCity(mapValue);
+        if (apiId == null) {
+            return success(columnList);
+        }
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }

src/main/java/com/steerinfo/dil/service/impl/RmsDirectlySentCityServiceImpl.java

@@ -32,8 +32,8 @@ public class RmsDirectlySentCityServiceImpl implements IRmsDirectlySentCityServi
             RmsDirectlySentCity rmsDirectlySentCity = new RmsDirectlySentCity();
             rmsDirectlySentCity.setPrimaryKeyId(rmsDirectlySentCityMapper.getMaxId());
             rmsDirectlySentCity.setDirectlySentName(infoMap.get("directlySentName") + "");
-            rmsDirectlySentCity.setProvinceCity(infoMap.get("provinceName") + "");
-            rmsDirectlySentCity.setDistrictCity(infoMap.get("districtName") + "");
+            rmsDirectlySentCity.setProvinceCity(infoMap.get("provinceName").toString());
+            rmsDirectlySentCity.setDistrictCity(infoMap.get("districtName").toString());
             rmsDirectlySentCity.setTownCity(infoMap.get("townName") + "");
             rmsDirectlySentCity.setPlace(infoMap.get("place") + "");
             rmsDirectlySentCity.setCarrierId(DataChange.dataToBigDecimal(infoMap.get("carrierId")));

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -26,6 +26,7 @@ public class ColumnDataUtil {
     }
 
     public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条