diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 242992f..b872d7b 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -10,6 +10,7 @@ import com.whdc.model.enums.VersionsType; import com.whdc.model.group.Find; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; +import com.whdc.model.vo.FcVo; import com.whdc.service.IAddressBookService; import com.whdc.service.IOrganizationService; import com.whdc.service.IUserService; @@ -60,7 +61,7 @@ public class AddressBookController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson page(@RequestBody AddressBootDto dto) { + public ResultJson page(@RequestBody AddressBootDto dto) { dto.setUserId(String.valueOf(StpUtil.getLoginId())); return ResultJson.ok(service.page(dto)); diff --git a/src/main/java/com/whdc/mapper/AddressBookMapper.java b/src/main/java/com/whdc/mapper/AddressBookMapper.java index 63e944d..e0522c6 100644 --- a/src/main/java/com/whdc/mapper/AddressBookMapper.java +++ b/src/main/java/com/whdc/mapper/AddressBookMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; +import com.whdc.model.vo.FcVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; */ public interface AddressBookMapper extends BaseMapper { - IPage page(@Param("page") IPage page, @Param("dto") AddressBootDto dto); + IPage page(@Param("page") IPage page, @Param("dto") AddressBootDto dto); List find(@Param("dto") AddressBook dto); diff --git a/src/main/java/com/whdc/service/IAddressBookService.java b/src/main/java/com/whdc/service/IAddressBookService.java index 671e764..a784f5c 100644 --- a/src/main/java/com/whdc/service/IAddressBookService.java +++ b/src/main/java/com/whdc/service/IAddressBookService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; +import com.whdc.model.vo.FcVo; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; public interface IAddressBookService extends IService { // 获取所有规则分页 - IPage page(AddressBootDto dto); + IPage page(AddressBootDto dto); // 获取所有规则 List find(AddressBook dto); diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java index 916b029..de2e127 100644 --- a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.AddressBookMapper; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; +import com.whdc.model.vo.FcVo; import com.whdc.service.IAddressBookService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ public class AddressBookServiceImpl extends ServiceImpl page(AddressBootDto dto) { + public IPage page(AddressBootDto dto) { String adcd = dto.getAdcd(); if (StringUtils.isNotBlank(adcd)) { diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index 2cdd624..515c4bc 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -3,7 +3,7 @@ - SELECT AB.*,F.SORT FSORT FROM