123

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

@@ -104,6 +104,15 @@
         LEFT JOIN branch_company i on v.subordinate_branch=i.id
         <where>
             v.is_del = 0
+            <if test="goodsType != null ">
+                AND  v.`goods_type`= #{goodsType}
+            </if>
+            <if test="branchId != null and branchId > 0">
+                AND  v.`subordinate_branch`= #{branchId}
+            </if>
+            <if test="name != null and  name != ''">
+                AND ( v.`name` like concat('%',#{name},'%') or i.`name` like concat('%',#{name},'%') )
+            </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
                 and i.id in
                 <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">