bug fix

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

 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
-        if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
-            return responseBean;
-        }
-
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
 
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
         TaBuilding  building = new TaBuilding();
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         Integer  status= jsonobject.getInteger("status");
         buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(id);
         building.setStatus(status);
+
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status);
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            return responseBean;
+        }
+
         taBuildingMapper.update(building,buildingIdQueryWrapper);
         return ResponseBean.success("");
     }
      * @param taBuilding
      * @return
      */
-    public boolean countIsMainBuilding(TaBuilding taBuilding, Integer orgId) {
-        if (taBuilding.getIsMain() != 1){
+    public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status) {
+        if (status == 2){
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
         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());
         }
     }
 
 
+
+
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
 
         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;
+    }
 }