Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.2.1</version>
+	<version>v3.5.2.2</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -244,6 +244,7 @@ public class ExtendContentController extends BaseController {
                 taExtendContentQueryWrapper.eq("org_id", getOrgId(request));
                 taExtendContentQueryWrapper.eq("status", 1);
                 taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+                taExtendContentQueryWrapper.ne("content_id", extendContent.getTargetId());
                 List<ExtendContent> extContentInfo = iExtendContentService.list(taExtendContentQueryWrapper);
                 if (!Collections.isEmpty(extContentInfo)){
                     responseBean.addError("该城市已有开屏广告，请勿再次上架");