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 = publishCountIsMainBuilding(building, orgId, null);
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -500,7 +500,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setBuildingId(id);
         building.setStatus(status);
 
-        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status);
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -843,8 +843,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @param taBuilding
      * @return
      */
-    public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status) {
-        if ((status != null && status == 2) || (taBuilding.getIsMain() != null && taBuilding.getIsMain() != 1)){
+    public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status, String operte) {
+        QueryWrapper<TaBuilding> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id", taBuilding.getBuildingId());
+        queryWrapper.eq("org_id", orgId);
+        TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
+        if (operte.equals("update") && (taBuilding.getIsMain() != 1 || info.getStatus() == 2)){
+            return true;
+        }
+        if (operte.equals("updateStatus") && status == 2){
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();