bug修改

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;

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<>();