| | |
| | | } |
| | | |
| | | @Override |
| | | public List<Addr> findListWithArea(Integer memberId) { |
| | | public List<Addr> findListWithArea(Integer memberId, String keyword) { |
| | | MPJLambdaWrapper<Addr> wrapper = new MPJLambdaWrapper<Addr>() |
| | | .selectAll(Addr.class) |
| | | .select("a3.name", Addr::getDistrictName) |
| | |
| | | .leftJoin("areas a2 on a2.id = a3.PARENT_ID") |
| | | .leftJoin("areas a1 on a1.id = a2.PARENT_ID") |
| | | .eq(Addr::getDeleted, Constants.ZERO) |
| | | .eq(Addr::getMemberId, memberId) |
| | | .orderByDesc(Addr::getIsDefault) |
| | | .eq(Addr::getMemberId, memberId); |
| | | if (StringUtils.isNotBlank(keyword)) { |
| | | wrapper.and(w -> w |
| | | .like(Addr::getAddr, keyword) |
| | | .or().like(Addr::getName, keyword) |
| | | .or().like(Addr::getPhone, keyword)); |
| | | } |
| | | wrapper.orderByDesc(Addr::getIsDefault) |
| | | .orderByDesc(Addr::getCreateTime); |
| | | return addrMapper.selectJoinList(Addr.class, wrapper); |
| | | } |