weiximei 6 gadus atpakaļ
vecāks
revīzija
0ecafe28a5

+ 4
- 0
whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java Parādīt failu

160
             responseBean.addError("活动不存在!");
160
             responseBean.addError("活动不存在!");
161
             return responseBean;
161
             return responseBean;
162
         }
162
         }
163
+        if (activity.getStatus() == 1) {
164
+            responseBean.addError("已发布的活动不能删除!");
165
+            return responseBean;
166
+        }
163
         activity.setStatus(-1);
167
         activity.setStatus(-1);
164
         iActivityService.update(activity, activityQueryWrapper);
168
         iActivityService.update(activity, activityQueryWrapper);
165
         responseBean.addSuccess("操作成功!");
169
         responseBean.addSuccess("操作成功!");

+ 2
- 0
whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java Parādīt failu

61
      * @return
61
      * @return
62
      */
62
      */
63
     ResponseBean buildingdelete(String id);
63
     ResponseBean buildingdelete(String id);
64
+
65
+
64
 }
66
 }

+ 2
- 1
whole-estate/src/main/resources/mapper/BuildingMapper.xml Parādīt failu

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