bug fix

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

@@ -290,7 +290,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -844,7 +844,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @return
      */
     public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status) {
-        if (status == 2){
+        if ((status != null && status == 2) || (taBuilding.getIsMain() != null && taBuilding.getIsMain() != 1)){
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
@@ -915,29 +915,4 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return rows;
     }
-
-    /**
-     * 推荐到首页楼盘不能超过10个
-     * @param taBuilding
-     * @return
-     */
-    public boolean countIsMainBuilding(TaBuilding taBuilding, Integer orgId) {
-        if (taBuilding.getIsMain() != 1){
-            return true;
-        }
-        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
-        taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
-        taBuildingQueryWrapper.eq("is_main", 1);
-        taBuildingQueryWrapper.eq("org_id", orgId);
-        taBuildingQueryWrapper.ne("status", "-1");
-        taBuildingQueryWrapper.ne("status", "2");
-        if (taBuilding.getBuildingId() != null){
-            taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
-        }
-        List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() >= 10){
-            return false;
-        }
-        return true;
-    }
 }