bug fix

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

@@ -164,6 +164,14 @@ public class ExtendContentController extends BaseController {
     })
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent, HttpServletRequest request){
+        ResponseBean  responseBean = new ResponseBean();
+        //一个城市只能有一个开屏广告
+        boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
+        if (!existFlag){
+            responseBean.addError("该城市已有开屏广告，请勿再次上架");
+            return responseBean;
+        }
+
         if (extendContent.getCityId() == null){
             Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
             extendContent.setCityId(cityId);
@@ -173,9 +181,9 @@ public class ExtendContentController extends BaseController {
         if (StringUtils.isEmpty(extendContent.getContentType())){
             extendContent.setContentType("nothing");
         }
-        ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
-          responseBean.addSuccess(extendContent);
-          return responseBean;
+        responseBean = iExtendContentService.extendContentAdd(extendContent);
+        responseBean.addSuccess(extendContent);
+        return responseBean;
     }
 
     /**
@@ -227,8 +235,6 @@ public class ExtendContentController extends BaseController {
             }
             extendContent.setOrgId(getOrgId(request));
 
-            iExtendContentService.judgleRelationBuildAndActivity(extendContent);
-
             if (extendContent.getStatus() == 1){
                 boolean publishFlag = iExtendContentService.judgleRelationBuildAndActivity(extendContent);
                 if (!publishFlag){
@@ -238,21 +244,12 @@ public class ExtendContentController extends BaseController {
             }
 
             //一个城市只能有一个开屏广告
-            if (extendContent.getStatus() == 1 && CommConstant.OPEN_SCREEN.equals(extendContent.getShowType())){
-                QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
-                taExtendContentQueryWrapper.eq("city_id", extendContent.getCityId());
-                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("该城市已有开屏广告，请勿再次上架");
-                    return responseBean;
-                }
+            boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
+            if (!existFlag){
+                responseBean.addError("该城市已有开屏广告，请勿再次上架");
+                return responseBean;
             }
 
-
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
             }else {

src/main/java/com/huiju/estateagents/service/IExtendContentService.java

@@ -47,4 +47,6 @@ public interface IExtendContentService extends IService<ExtendContent> {
     void updateActivity(String dynamicId, String type,Integer orgId);
 
     boolean judgleRelationBuildAndActivity(ExtendContent extendContent);
+
+    boolean advertistExistFlag(ExtendContent extendContent, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -9,6 +9,7 @@ import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IExtendContentService;
+import io.jsonwebtoken.lang.Collections;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -168,4 +169,24 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
 
         return true;
     }
+
+    @Override
+    public boolean advertistExistFlag(ExtendContent extendContent, Integer orgId) {
+        //一个城市只能有一个开屏广告
+        if (extendContent.getStatus() == 1 && CommConstant.OPEN_SCREEN.equals(extendContent.getShowType())){
+            QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+            taExtendContentQueryWrapper.eq("city_id", extendContent.getCityId());
+            taExtendContentQueryWrapper.eq("org_id", orgId);
+            taExtendContentQueryWrapper.eq("status", 1);
+            taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+            if (null != extendContent.getContentId()){
+                taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
+            }
+            List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
+            if (!Collections.isEmpty(extContentInfo)){
+                return false;
+            }
+        }
+        return true;
+    }
 }