Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

dev_shibei_match
wxz 4 years ago
parent
commit
f657621678
  1. 2
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
  2. 1
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

2
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

@ -38,7 +38,7 @@
hc.CONFIGURATION_DESCRIPTION, hc.CONFIGURATION_DESCRIPTION,
chd.REGION, chd.REGION,
chd.CONFIGURATION, chd.CONFIGURATION,
chd.DEMO_DATA, hc.DEMO_DATA,
chd.DISPLAY_ORDER chd.DISPLAY_ORDER
FROM FROM
( (

1
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@ -291,6 +291,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
//补充信息更新到党员基本信息表 //补充信息更新到党员基本信息表
PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO); PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
if (null == partyMemberInfo) { if (null == partyMemberInfo) {
log.warn("partymemberInfoService.getPartyMemberInfo return null,this partyMember maybe have audited,param:{}", JSON.toJSON(infoDTO));
return new Result(); return new Result();
} }
infoDTO.setId(partyMemberInfo.getId()); infoDTO.setId(partyMemberInfo.getId());

Loading…
Cancel
Save