|
@ -1481,7 +1481,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
if (ler != null) { |
|
|
if (ler != null) { |
|
|
groupDetail.setAuditStatus(ler.getAuditStatus()); |
|
|
groupDetail.setAuditStatus(ler.getAuditStatus()); |
|
|
groupDetail.setRemark(ler.getRemark()); |
|
|
groupDetail.setRemark(ler.getRemark()); |
|
|
groupDetail.setPartyOrgId(ler.getPartyOrgId()); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (ler != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(ler.getAuditStatus())) { |
|
|
if (ler != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(ler.getAuditStatus())) { |
|
@ -1489,13 +1488,14 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou |
|
|
groupDetail.setGroupHeadPhoto(ler.getGroupHeadPhoto()); |
|
|
groupDetail.setGroupHeadPhoto(ler.getGroupHeadPhoto()); |
|
|
groupDetail.setGroupName(ler.getGroupName()); |
|
|
groupDetail.setGroupName(ler.getGroupName()); |
|
|
groupDetail.setGroupIntroduction(ler.getGroupIntroduction()); |
|
|
groupDetail.setGroupIntroduction(ler.getGroupIntroduction()); |
|
|
|
|
|
groupDetail.setPartyOrgId(ler.getPartyOrgId()); |
|
|
} else { |
|
|
} else { |
|
|
// 不在审核中,直接显示组信息
|
|
|
// 不在审核中,直接显示组信息
|
|
|
ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId); |
|
|
ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId); |
|
|
if (resiGroupEntity == null) { |
|
|
if (resiGroupEntity == null) { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
groupDetail.setPartyOrgId(resiGroupEntity.getPartyOrgId()); |
|
|
groupDetail.setGroupHeadPhoto(resiGroupEntity.getGroupHeadPhoto()); |
|
|
groupDetail.setGroupHeadPhoto(resiGroupEntity.getGroupHeadPhoto()); |
|
|
groupDetail.setGroupName(resiGroupEntity.getGroupName()); |
|
|
groupDetail.setGroupName(resiGroupEntity.getGroupName()); |
|
|
groupDetail.setGroupIntroduction(resiGroupEntity.getGroupIntroduction()); |
|
|
groupDetail.setGroupIntroduction(resiGroupEntity.getGroupIntroduction()); |
|
|