添加model相关修改

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -520,29 +520,7 @@
         and vm.id is not null
         and vm.status = 1
         and vm.isdel = 0
-        and bc.id is not null)
-        <if test="startCompanyId != null or parkBranchCompanyId != null ">
-        union
-        (select id as model_id,
-            <choose>
-                <when test="startCompanyId != null">
-                    #{startCompanyId} as company_id,
-                </when>
-                <otherwise>
-                    #{parkBranchCompanyId} as company_id,
-                </otherwise>
-            </choose>
-            <if test=" catas != null ">
-                null as catas,
-            </if>
-            <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-                0 as hasVehicle,
-            </if>
-            <if test="lon != null and lat != null">
-                0 as distance
-            </if>
-                from vehicle_model where vehicle_model.isdel = 0)
-        </if>
+        and bc.id is not null
         GROUP BY model_id, company_id
         <if test="lon != null and lat != null">, distance</if>
         <!--<if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">, hasVehicle</if>-->
@@ -562,7 +540,30 @@
             </foreach>
             ) > 0
         </if>
-
+        )
+        <!-- union 所有车型 -->
+        <if test="startCompanyId != null or parkBranchCompanyId != null ">
+            union
+            (select id as model_id,
+            <choose>
+                <when test="startCompanyId != null">
+                    #{startCompanyId} as company_id,
+                </when>
+                <otherwise>
+                    #{parkBranchCompanyId} as company_id,
+                </otherwise>
+            </choose>
+            <if test=" catas != null ">
+                null as catas,
+            </if>
+            <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
+                0 as hasVehicle,
+            </if>
+            <if test="lon != null and lat != null">
+                0 as distance
+            </if>
+            from vehicle_model where vehicle_model.isdel = 0)
+        </if>
         <if test="lon != null and lat != null">
             order by
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">