diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java index fafcb8c..1acf2be 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java @@ -48,8 +48,8 @@ public class AirlineFileGroupInfoController extends BaseController { public TableDataInfo selectGroupInfoListById(@PathVariable("groupId") Long groupId) { startPage(); List list = iAirlineFileGroupInfoService.selectGroupInfoListById(groupId); - List result = AirlineFileGroupInfoControllerConvert.toApiDomainList(list); - return getDataTable(result); +// List result = AirlineFileGroupInfoControllerConvert.fromList(list); + return getDataTable(list); } /** diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java index 4b39eef..3af968b 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java @@ -53,9 +53,12 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer @Override public Long save(AirlineFileGroupInfoDTO dto) throws BaseException { - + String name = dto.getAirlineFileDTO().getName(); + name = iAirlineFileService.getNewFileNameLikeByGroupId(name, dto.getGroupId()); + dto.getAirlineFileDTO().setName(name); AirlineFileDTO result = iAirlineFileService.save(dto.getAirlineFileDTO()); + dto.setAirlineId(result.getId()); // 保存分组信息 AirlineFileGroupInfo model = AirlineFileGroupInfoServiceConvert.to(dto);