luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

党员相关bug修改

dev
zhaoqifeng 3 years ago
parent
02cc325bf2
commit
be88e66eaa
2 changed files with 31 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
  2. 40
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

1
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
View File

@ -75,6 +75,7 @@ public class IcPartyMemberController implements ResultDataResolver {
private IcPartyMemberService icPartyMemberService; private IcPartyMemberService icPartyMemberService;
@RequestMapping("page") @RequestMapping("page")
@MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
public Result<PageData<IcPartyMemberResultDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO){ public Result<PageData<IcPartyMemberResultDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO){
PageData<IcPartyMemberResultDTO> page = icPartyMemberService.page(tokenDto, formDTO); PageData<IcPartyMemberResultDTO> page = icPartyMemberService.page(tokenDto, formDTO);
return new Result<PageData<IcPartyMemberResultDTO>>().ok(page); return new Result<PageData<IcPartyMemberResultDTO>>().ok(page);

40
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
View File

@ -279,10 +279,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
//查询房屋信息 //查询房屋信息
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID")); HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
if (null != gridInfo && null != houseInfo) { if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath()) String address;
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName()) if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName()); address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
partyMemberDTO.setAddress(address); .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
} else {
address = gridInfo.getGridNamePath()
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
}
} }
} }
//2022.05.18 end zhaoqf //2022.05.18 end zhaoqf
@ -499,9 +505,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} }
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId); HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
if (null != gridInfo && null != houseInfo) { if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath()) String address;
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName()) if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName()); address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
} else {
address = gridInfo.getGridNamePath()
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
}
partyMemberDTO.setAddress(address); partyMemberDTO.setAddress(address);
} }
} }
@ -2191,9 +2204,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
//查询房屋信息 //查询房屋信息
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), entity.getHomeId()); HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), entity.getHomeId());
if (null != gridInfo && null != houseInfo) { if (null != gridInfo && null != houseInfo) {
String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath()) String address;
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName()) if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName()); address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
} else {
address = gridInfo.getGridNamePath()
.concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
.concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
}
result.setAddress(address); result.setAddress(address);
} }
} }

Write Preview
Loading…
Cancel
Save