@@ -400,8 +400,10 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
@Select("SELECT id,external_user_id,name,avatar,remark,description,fs_user_id FROM qw_external_contact " +
" WHERE user_id = #{map.userId} " +
- "AND external_user_id = #{map.externalUserId} " +
"AND corp_id =#{map.corpId} " +
+ "AND external_user_id = #{map.externalUserId}" +
+ "AND `status` != 4 " +
+ "ORDER BY id desc " +
"limit 1 ")
QwExternalContact getQwExternalContactDetails(@Param("map")QwExternalContactHParam param);
@@ -2230,7 +2230,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
QwContactWay wayId = null;
//先入客户
QwExternalContact qwExternalContact = qwExternalContactMapper.selectQwExternalByExternalIdAndCompanyIdToIdAndFs(externalUserID, userID, corpId);
- boolean isNewQwExternalContact = qwExternalContact == null ? true : false;
+ boolean isNewQwExternalContact = qwExternalContact == null;
qwExternalContact = qwExternalContact == null ? new QwExternalContact() : qwExternalContact;
qwExternalContact.setUserId(userID); // 设置属于用户ID
qwExternalContact.setExternalUserId(externalUserID); // 设置外部联系人ID