THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复接口500的问题，增加BaseController getDataTable 的空表处理

This commit is contained in:
高大 2026-01-26 15:47:46 +08:00
parent 4d4b85dd7f
commit acc087cd72
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ruoyi/airline/controller/AirlineFileGroupController.java
View File

@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -58,7 +57,7 @@ public class AirlineFileGroupController extends BaseController {
// @RequiresPermissions("airline:group:query")
@GetMapping(value = "/{groupId}")
@Operation(summary = "根据分组ID 获取分组详情信息")
public AjaxResult getInfo(@PathVariable Long groupId) {
public AjaxResult getInfo(@PathVariable("groupId") Long groupId) {
return success(iAirlineFileGroupService.selectAirLineListsByGroupId(SecurityUtils.getUserId(), groupId));
}
@ -72,7 +71,7 @@ public class AirlineFileGroupController extends BaseController {
public AjaxResult add(@Validated @RequestBody AirlineFileGroupVO group) {
group.setUserId(SecurityUtils.getUserId());
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) {
if (iAirlineFileGroupService.checkGroupNameUnique(dto)) {
return error("新增分组'" + group.getGroupName() + "'失败，分组名称已存在");
}
return toAjax(iAirlineFileGroupService.insertGroup(dto));
@ -88,7 +87,7 @@ public class AirlineFileGroupController extends BaseController {
public AjaxResult edit(@Validated @RequestBody AirlineFileGroupVO group) {
group.setUserId(SecurityUtils.getUserId());
AirlineFileGroupDTO dto = AirlineFileGroupControllerConvert.toDTO(group);
if (!iAirlineFileGroupService.checkGroupNameUnique(dto)) {
if (iAirlineFileGroupService.checkGroupNameUnique(dto)) {
return error("修改分组'" + group.getGroupName() + "'失败，分组名称已存在");
}
return toAjax(iAirlineFileGroupService.updateGroup(dto));
@ -101,7 +100,7 @@ public class AirlineFileGroupController extends BaseController {
@Log(title = "删除分组", businessType = BusinessType.DELETE)
@DeleteMapping("/{groupId}")
@Operation(summary = "删除分组")
public AjaxResult remove(@PathVariable Long groupId) {
public AjaxResult remove(@PathVariable("groupId") Long groupId) {
return toAjax(iAirlineFileGroupService.deletegroupById(SecurityUtils.getUserId(), groupId));
}

4
src/main/java/com/ruoyi/airline/controller/AirlineFileGroupInfoController.java
View File

@ -45,9 +45,9 @@ public class AirlineFileGroupInfoController extends BaseController {
* @return
*/
// @RequiresPermissions("airline:groupInfo:list")
@GetMapping()
@GetMapping("/{groupId}")
@Operation(summary = "编辑航线文件内容，生产航点新文件")
public TableDataInfo selectGroupInfoListById(Long groupId) {
public TableDataInfo selectGroupInfoListById(@PathVariable("groupId") Long groupId) {
startPage();
List<AirlineFileGroupInfoDTO> list = iAirlineFileGroupInfoService.selectGroupInfoListById(groupId);
List<AirlineFileGroupInfoVO> result = AirlineFileGroupInfoControllerConvert.toApiDomainList(list);