Commit 0383d6c0 authored by 周健威's avatar 周健威

修改bug

parent c166f5e5
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
<!-- union 所有车型 --> <!-- union 所有车型 -->
<if test="startCompanyId != null or parkBranchCompanyId != null "> <if test="startCompanyId != null or parkBranchCompanyId != null ">
union union
(select id as model_id, bc.id as company_id (select vm.id as model_id, bc.id as company_id
<if test=" catas != null "> <if test=" catas != null ">
,null as catas ,null as catas
</if> </if>
...@@ -555,7 +555,7 @@ ...@@ -555,7 +555,7 @@
<!-- 处理距离 --> <!-- 处理距离 -->
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if> </if>
from vehicle_model from vehicle_model vm
left join branch_company bc on left join branch_company bc on
<choose> <choose>
<when test="startCompanyId != null"> <when test="startCompanyId != null">
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
bc.id = #{parkBranchCompanyId} bc.id = #{parkBranchCompanyId}
</otherwise> </otherwise>
</choose> </choose>
where vehicle_model.isdel = 0) where vm.isdel = 0)
</if> </if>
<if test="lon != null and lat != null"> <if test="lon != null and lat != null">
order by order by
......
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