diff --git a/src/main/java/com/whdc/controller/FcController.java b/src/main/java/com/whdc/controller/FcController.java index 117b303..1c13051 100644 --- a/src/main/java/com/whdc/controller/FcController.java +++ b/src/main/java/com/whdc/controller/FcController.java @@ -43,8 +43,8 @@ public class FcController { } - @ApiOperation(value = "分页查询") - @PostMapping(value = "page") +// @ApiOperation(value = "分页查询") +// @PostMapping(value = "page") public ResultJson page(@RequestBody @Validated(Find.class) FcDto dto) { return ResultJson.ok(service.page(dto)); @@ -79,10 +79,11 @@ public class FcController { service.lambdaQuery() .eq(Fc::getUserId,String.valueOf(model.getUserId()).trim()) .eq(Fc::getAbId,String.valueOf(model.getAbId()).trim()) + .eq(Fc::getType,String.valueOf(model.getType()).trim()) .ne(Fc::getId, model.getId()) .list()) ){ - return ResultJson.error("该名称重复"); + return ResultJson.error("该排序已添加"); } model.setUserId(Integer.valueOf(String.valueOf(StpUtil.getLoginId()))); diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index 94c5137..5c63f13 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -30,7 +30,7 @@ AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%') - ORDER BY AB.SORT + ORDER BY F.SORT,AB.SORT,F.SORT NULLS LAST