Merge remote-tracking branch 'origin/master'

ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java

@@ -86,7 +86,8 @@ public class AdServiceImpl implements AdService {
             AdQuery query = new AdQuery();
             query.setAreaId(ad.getAreaId());
             query.setDeleted(false);
-            ServiceUtil.assertion(adMapper.selectOne(query) != null, "当前运营区存在广告已达上限");
+            List<AdVO> adVOList = adMapper.selectAdList(query);
+            ServiceUtil.assertion(adVOList.size() > 1, "当前运营区存在广告已达上限");
         }
         ad.setCreateTime(DateUtils.getNowDate());
         return adMapper.insertAd(ad);