Skip to content

Y
yichengstreet-be
Commit a6698534 authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev-lx' into dev

parents 0bd26728 6feb5e7c
Pipeline #144872 failed with stages
      in 7 minutes and 18 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 40 additions and 42 deletions
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ a6698534
      ...@@ -135,8 +135,7 @@ ...@@ -135,8 +135,7 @@
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
      LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
      LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id
      <where> where t1.rental_unit = 5 and t1.show_flag = 1
      and t1.show_flag = 1
      <if test="query.wgType != null"> <if test="query.wgType != null">
      and t1.type = #{query.wgType} and t1.type = #{query.wgType}
      </if> </if>
      ...@@ -176,7 +175,6 @@ ...@@ -176,7 +175,6 @@
      #{item} #{item}
      </foreach> </foreach>
      </if> </if>
      </where>
      GROUP BY t1.id GROUP BY t1.id
      <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''"> <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''">
      having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin} and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax} having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin} and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment