Commit 7ac53d64 by fudahua

素材列表fix

parent 1151a1c5
...@@ -689,7 +689,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -689,7 +689,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
} }
dto.setWxEnterpriseId(wxEnterpriseId); dto.setWxEnterpriseId(wxEnterpriseId);
dto.setExternalName(externalUserDTO.getName()); dto.setExternalName(EmojiFilterUtil.removeAllEmoji(externalUserDTO.getName()));
dto.setAddCreateTime(externalUserDTO.getAddCreateTime()); dto.setAddCreateTime(externalUserDTO.getAddCreateTime());
dto.setAvatar(externalUserDTO.getAvatar()); dto.setAvatar(externalUserDTO.getAvatar());
if (SELF_APP.equals(suiteid)) { if (SELF_APP.equals(suiteid)) {
...@@ -711,6 +711,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -711,6 +711,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
dto.setSelfExternalUserid(dto.getSelfExternalUserid() == null ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid()); dto.setSelfExternalUserid(dto.getSelfExternalUserid() == null ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid());
dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId()); dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId());
dto.setAvatar(dto.getAvatar() == null ? midRelatedDto.getAvatar() : dto.getAvatar()); dto.setAvatar(dto.getAvatar() == null ? midRelatedDto.getAvatar() : dto.getAvatar());
MemberUnionidRelatedDTO oldRelation = memberUnionRelatedService.getBySelfExternalUserId(dto.getWxUserId(), dto.getWxEnterpriseId(), dto.getSelfExternalUserid());
//老的关联需要删除
if (null != oldRelation && (!oldRelation.getMemberUnionidRelatedId().equals(midRelatedDto.getMemberUnionidRelatedId()))) {
oldRelation.setStatusFlag(0);
memberUnionRelatedService.update(oldRelation);
}
memberUnionRelatedService.update(dto); memberUnionRelatedService.update(dto);
RedisUtil.unlock(lockKey); RedisUtil.unlock(lockKey);
return dto; return dto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment