提交

whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java

@@ -160,6 +160,10 @@ public class ActivityController extends BaseController {
             responseBean.addError("活动不存在!");
             return responseBean;
         }
+        if (activity.getStatus() == 1) {
+            responseBean.addError("已发布的活动不能删除!");
+            return responseBean;
+        }
         activity.setStatus(-1);
         iActivityService.update(activity, activityQueryWrapper);
         responseBean.addSuccess("操作成功!");

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java

@@ -61,4 +61,6 @@ public interface IBuildingService extends IService<Building> {
      * @return
      */
     ResponseBean buildingdelete(String id);
+
+
 }

whole-estate/src/main/resources/mapper/BuildingMapper.xml

@@ -4,8 +4,9 @@
     <select id="buildingList" resultType="com.example.wholeestate.model.Building">
         SELECT * FROM ta_building
             <where>
+            status > -1
             <if test="Name != null and Name != ''">
-            and  ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%')
+            and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>
             <if test="Code != null and Code != ''">
             and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')