Merge branch 'sys_corp_follow_func' into pre

netflix-dao/src/main/java/com/cyksj/model/entity/SysCorpFollowRelate.java

@@ -18,12 +18,12 @@ public class SysCorpFollowRelate extends BaseEntity{
 
 	private String followId;
 
+	/**
+	 * 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业
+	 */
 	private Integer status;
 
 	private String img;
 
-	/**
-	 * 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业
-	 */
 	private Boolean deleted;
 }

netflix-service/src/main/java/com/cyksj/service/sys/impl/SysCorpFollowServiceImpl.java

@@ -54,6 +54,7 @@ public class SysCorpFollowServiceImpl extends ServiceImpl<SysCorpFollowMapper, S
 		String followId = sysCorpFollowRelate.getFollowId();
 		Integer selectCount = sysCorpFollowRelateMapper.selectCount(Wrappers.lambdaQuery(SysCorpFollowRelate.class)
 				.eq(SysCorpFollowRelate::getFollowId, followId)
+				.ne(sysCorpFollowRelate.getId() != null, SysCorpFollowRelate::getId, sysCorpFollowRelate.getId())
 				.eq(SysCorpFollowRelate::getDeleted, 1));
 		if (selectCount > 0) {
 			throw BusinessRuntimeException.getInstance("已添加该客服");