diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 4539193..2010588 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -2,7 +2,6 @@ package com.whdc.controller; import cn.dev33.satoken.stp.StpUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AbUdR; @@ -69,7 +68,8 @@ public class AddressBookController { dto.setUserId(String.valueOf(StpUtil.getLoginId())); IPage page = service.page(dto); - return ResultJson.ok(JSON.parseObject(JSON.toJSONString(page).replaceAll("null",""))); +// return ResultJson.ok(JSON.parseObject(JSON.toJSONString(page).replaceAll("null",""))); + return ResultJson.ok(page); } @@ -282,7 +282,8 @@ public class AddressBookController { if (Objects.isNull(byId)){ return ResultJson.error("该用户不存在"); } - return ResultJson.ok(JSON.parseObject(JSON.toJSONString(service.getById(byId.getAbId())).replaceAll("null",""))); +// return ResultJson.ok(JSON.parseObject(JSON.toJSONString(service.getById(byId.getAbId())).replaceAll("null",""))); + return ResultJson.ok(service.getById(byId.getAbId())); } }