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

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/HgxfxJgReportServiceImpl.java

@@ -64,7 +64,7 @@ public class HgxfxJgReportServiceImpl implements HgxfxJgReportService {
         updateWrapper.eq("bsm", hgxfxReportVo.getBsm()); // 设置要更新的字段
         HgxfxDTO res = new HgxfxDTO();
         res.setBsm(hgxfxReportVo.getBsm());
-        res.setFxbg(xDpath);
+        res.setFxbg(xDpath.replace("\\", "/"));
         // 执行更新操作
         hgxfxMapper.update(res, updateWrapper);
         iLogService.saveLog(hgxfxReportVo.getBsm(), "辅助选址", "选址报告生成结束", "info");

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

@@ -214,7 +214,8 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         List<TableLayerDTO> TableLayerDTOPid = tableLayerMapper.selectList(queryTableLayerPidWrapper);
         List<String> tableDataIds = new ArrayList<>();
         if (StringUtils.isNotEmpty(sourceDataId)) {
-            tableDataIds.add(sourceDataId);
+            String[] vDataId = sourceDataId.split(",");
+            tableDataIds.addAll(Arrays.asList(vDataId));
         }
 
         if (TableLayerDTOPid == null || TableLayerDTOPid.size() == 0) {

onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/controller/ShpController.java

@@ -33,7 +33,7 @@ public class ShpController {
     public RequestResult writeShpByWkt(@RequestBody ShpVo shpVo) throws Exception {
         String path = writeShpServer.writeShpByWkt(shpVo.getWkt(), shpVo.getFileName());
         Map<String, String> map = new HashMap<>();
-        map.put("path", path);
+        map.put("path", path.replace("\\", "/"));
         return RequestResult.success(map);
     }
 }