通讯录查询修改

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<FcVo> 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())));
 

src/main/resources/mapper/AddressBookMapper.xml

@@ -30,7 +30,7 @@
         <if test="dto.phone != null and dto.phone != '' ">
             AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
         </if>
-        ORDER BY AB.SORT
+        ORDER BY F.SORT,AB.SORT,F.SORT NULLS LAST
     </select>