diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index cc001cb..24d6b25 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -475,6 +475,7 @@ if(NumberUtils.isDigits(idstr)){ markerDto.setId(Long.valueOf(idstr)); MarkerDto marker = getMarkerById(markerDto.getId());//保证id和markerId对应,没有更改 + if(markerDto.getMarkerId().startsWith("'")) markerDto.setMarkerId(markerDto.getMarkerId().substring(1)); if(!markerDto.getMarkerId().equals(marker.getMarkerId())) return 5; }else if(StringUtils.isNotBlank(idstr)){ return 5; @@ -613,6 +614,9 @@ } else { markerDtos = getAllPoint(user); } + for(MarkerDto markerDto:markerDtos){ + if(StringUtils.isNotBlank(markerDto.getMarkerId())) markerDto.setMarkerId("'"+markerDto.getMarkerId()); + } if (type == 1) { excelName = "管线信息"; excelColumns = "id,markerObjectType,pipeMaterial,pipeDiameter,layStyle,depth," +