From ce1e3887094b21cb8af42f8836150ca3526b0867 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 21 Apr 2022 14:29:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcPartyActivityDTO.java       | 1 -
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
index 23451a79d7..b0367639ed 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@@ -68,7 +68,6 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * act_info表ID
      */
-    @JsonIgnore
     private String actId;
 
     private String unitId;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index bf4e68bd1d..4b3dab701f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -209,7 +209,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //2021.11.25  end
                 //2022.04.19 start 这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
-                if (map.containsKey("YHZGX")) {
+                if (map.containsKey("YHZGX") && RelationshipEnum.SELF.getCode().equals(map.get("YHZGX"))) {
                     LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
                     wrapper.eq(IcResiUserEntity::getHomeId, map.get("HOME_ID"));
                     wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode());
@@ -339,7 +339,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //2021.11.25  end
                 //2022.04.19 start 这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户
-                if (map.containsKey("YHZGX")) {
+                if (map.containsKey("YHZGX") && RelationshipEnum.SELF.getCode().equals(map.get("YHZGX"))) {
                     IcResiUserEntity entity = baseDao.selectById(map.get("ID"));
                     if (entity != null && !RelationshipEnum.SELF.getCode().equals(entity.getYhzgx())) {
                         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();

From b2564c73213230fbc56ac75ccedaa387c39944fe Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 21 Apr 2022 14:38:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcPartyActivityDao.xml             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index 9bd0824165..1117174bcc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -49,6 +49,7 @@
     <select id="selectActivityList" resultType="com.epmet.entity.IcPartyActivityEntity" parameterType = "com.epmet.dto.form.PartyActivityFormDTO">
         SELECT
             a.ID,
+            a.ACT_ID,
             a.GRID_ID,
             b.unitId,
             c.serviceMatter,