bug fix

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

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITdCityService;
+import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -30,6 +32,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * <p>
@@ -158,6 +162,9 @@ public class ExtendContentController extends BaseController {
         }
         extendContent.setCreateDate(LocalDateTime.now());
         extendContent.setOrgId(getOrgId(request));
+        if (StringUtils.isEmpty(extendContent.getContentType())){
+            extendContent.setContentType("nothing");
+        }
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
           return responseBean;
@@ -212,13 +219,14 @@ public class ExtendContentController extends BaseController {
             }
             extendContent.setOrgId(getOrgId(request));
 
-            if (extendContent.getStatus() == 1){
+            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);
-                ExtendContent extContentInfo = iExtendContentService.getOne(taExtendContentQueryWrapper);
-                if (extContentInfo != null){
+                taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+                List<ExtendContent> extContentInfo = iExtendContentService.list(taExtendContentQueryWrapper);
+                if (!Collections.isEmpty(extContentInfo)){
                     responseBean.addError("该城市已有开屏广告，请勿再次上架");
                     return responseBean;
                 }