diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java index 565ded5..87ee626 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java @@ -45,7 +45,11 @@ public class AirlineMarkerController extends BaseController { marker.setCreateBy(SecurityUtils.getUserId().toString()); marker.setUpdateBy(SecurityUtils.getUserId().toString()); AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(marker); - return toAjax(iAirlineMarkerGroupInfoService.insertMarker(dto)); + AirlineMarkerDTO result = iAirlineMarkerGroupInfoService.insertMarker(dto); + if (result != null) { + return success(result); + } + return error("新增标注失败"); } /** diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java index 0851b64..a064ac6 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java @@ -35,20 +35,27 @@ public class AirlineMarkerGroupInfoServiceImpl implements IAirlineMarkerGroupInf @Override - public int insertMarker(AirlineMarkerDTO dto) { + public AirlineMarkerDTO insertMarker(AirlineMarkerDTO dto) { AirlineMarker model = AirlineMarkerServiceConvert.to(dto); int result = iAirlineMarkerDomain.insertMarker(model); // 处理分组关系 - if (result > 0 && dto.getGroupId() != null) { - AirlineMarkerGroupInfo groupInfo = new AirlineMarkerGroupInfo(); - groupInfo.setGroupId(dto.getGroupId()); - groupInfo.setMarkerId(model.getId()); - groupInfo.setCreateBy(dto.getCreateBy()); - groupInfo.setUpdateBy(dto.getUpdateBy()); - iAirlineMarkerGroupInfoDomain.insertMarkerGroupInfo(groupInfo); + if (result > 0) { + Long groupId = dto.getGroupId(); + if (groupId != null) { + AirlineMarkerGroupInfo groupInfo = new AirlineMarkerGroupInfo(); + groupInfo.setGroupId(groupId); + groupInfo.setMarkerId(model.getId()); + groupInfo.setCreateBy(dto.getCreateBy()); + groupInfo.setUpdateBy(dto.getUpdateBy()); + iAirlineMarkerGroupInfoDomain.insertMarkerGroupInfo(groupInfo); + } + // 转换回 DTO 并设置 groupId + AirlineMarkerDTO resultDto = AirlineMarkerServiceConvert.from(model); + resultDto.setGroupId(groupId); + return resultDto; } - return result; + return null; } public int deleteMarker(AirlineMarkerDTO dto) {