代码提交
parent
3efd2cd51b
commit
4c05f97dd4
|
|
@ -2,7 +2,6 @@ package com.whdc.controller;
|
||||||
|
|
||||||
|
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
import cn.dev33.satoken.stp.StpUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.whdc.model.dto.AddressBootDto;
|
import com.whdc.model.dto.AddressBootDto;
|
||||||
import com.whdc.model.entity.AbUdR;
|
import com.whdc.model.entity.AbUdR;
|
||||||
|
|
@ -69,7 +68,8 @@ public class AddressBookController {
|
||||||
dto.setUserId(String.valueOf(StpUtil.getLoginId()));
|
dto.setUserId(String.valueOf(StpUtil.getLoginId()));
|
||||||
IPage<AddressBookVo> page = service.page(dto);
|
IPage<AddressBookVo> 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)){
|
if (Objects.isNull(byId)){
|
||||||
return ResultJson.error("该用户不存在");
|
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()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue