From b9790deea76599117d582af82238a49aeef99158 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 6 Sep 2022 14:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 54d83ed951..bbfff94490 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -1481,7 +1481,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (ler != null) {
 			groupDetail.setAuditStatus(ler.getAuditStatus());
 			groupDetail.setRemark(ler.getRemark());
-			groupDetail.setPartyOrgId(ler.getPartyOrgId());
 		}
 
 		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.setGroupName(ler.getGroupName());
 			groupDetail.setGroupIntroduction(ler.getGroupIntroduction());
+			groupDetail.setPartyOrgId(ler.getPartyOrgId());
 		} else {
 			// 不在审核中，直接显示组信息
 			ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId);
 			if (resiGroupEntity == null) {
 				return null;
 			}
-
+			groupDetail.setPartyOrgId(resiGroupEntity.getPartyOrgId());
 			groupDetail.setGroupHeadPhoto(resiGroupEntity.getGroupHeadPhoto());
 			groupDetail.setGroupName(resiGroupEntity.getGroupName());
 			groupDetail.setGroupIntroduction(resiGroupEntity.getGroupIntroduction());