Merge branch 'dev_bugfix_ljj' into dev

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

@@ -290,6 +290,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 		//补充信息更新到党员基本信息表
 		PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
+		if (null == partyMemberInfo) {
+			return new Result();
+		}
 		infoDTO.setId(partyMemberInfo.getId());
 		partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class));
 		PartymemberConfirmManualDTO partymemberConfirmManualDTO =