wlzboy
2025-10-26 ff6f22859f2293cc823818813c1c4874bdd53b6f
ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
@@ -39,9 +39,6 @@
            <if test="vehicleModel != null  and vehicleModel != ''"> and v.vehicle_model = #{vehicleModel}</if>
            <if test="status != null  and status != ''"> and v.status = #{status}</if>
            <if test="platformCode != null  and platformCode != ''"> and v.platform_code = #{platformCode}</if>
<<<<<<< HEAD
            <if test="deptId != null"> and v.dept_id = #{deptId}</if>
=======
            <!-- 部门过滤:自动查找传入部门所属的分公司(parent_id=100) -->
            <if test="deptId != null">
                and v.dept_id = (
@@ -65,7 +62,7 @@
            and v.car_id is not null and v.car_id != ''
            and v.dept_id is not null
            and v.status=0
>>>>>>> feature-task
        </where>
    </select>
    
@@ -77,14 +74,11 @@
    <select id="selectVehicleInfoByPlateNumber" parameterType="String" resultMap="VehicleInfoResult">
        <include refid="selectVehicleInfoVo"/>
        where v.vehicle_no = #{plateNumber}
<<<<<<< HEAD
    </select>
    <select id="selectVehicleInfoByVehicleNo" parameterType="String" resultMap="VehicleInfoResult">
        <include refid="selectVehicleInfoVo"/>
        where v.vehicle_no = #{vehicleNo}
=======
>>>>>>> feature-task
    </select>
        
    <insert id="insertVehicleInfo" parameterType="VehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">