2 Ревизии ddb690f622 ... c477f5e278

Автор SHA1 Съобщение Дата
  chenfan c477f5e278 Merge remote-tracking branch 'origin/master' преди 1 месец
  chenfan 7d0ea2a85b 优化 преди 1 месец
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      pro-base/src/main/resources/mybatis/buildManage/ParkRoomReservationExtendMapper.xml

+ 2 - 2
pro-base/src/main/resources/mybatis/buildManage/ParkRoomReservationExtendMapper.xml

@@ -139,10 +139,10 @@
                 and a.build_id = #{mnpBuildingId}
                 and a.build_id = #{mnpBuildingId}
             </if>
             </if>
             <if test="roomAddress!=null and roomAddress!=''">
             <if test="roomAddress!=null and roomAddress!=''">
-                and concat(a.group_name, a.disc_name, a.build_name, '号', a.room_no, '室') like concat('%',#{roomAddress},'%')
+                and concat(d.group_name, e.name, f.build_num, '号', a.room_no, '室') like concat('%',#{roomAddress},'%')
             </if>
             </if>
         </where>
         </where>
-        order by group_name, build_name + 0, room_no + 0
+        order by d.group_name, f.build_num + 0, room_no + 0
     </select>
     </select>
 
 
     <select id="getReservationByRoomAndTime" resultType="com.idea.buildManage.model.ParkRoomReservation">
     <select id="getReservationByRoomAndTime" resultType="com.idea.buildManage.model.ParkRoomReservation">