Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -140,7 +140,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if(vehicleBookRecordQueryVo.getCompanyId() != null) {
             companyList.add(vehicleBookRecordQueryVo.getCompanyId());
         }
-        vehicleBookRecordQueryVo.setCompanyIds(companyList.size() > 0 ? companyList : null);
+        vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         return RestResponse.suc(pageDataVO);

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

@@ -387,7 +387,7 @@
             LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_start_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -419,7 +419,7 @@
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_start_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}

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

@@ -463,13 +463,13 @@
            <if test="numberPlate != null">
                and v1.number_plate = #{numberPlate}
            </if>
-           <if test="companyIds != null">
+           <if test="companyIds != null and companyIds.size > 0">
                and v1.park_branch_company_id in
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
-           <if test="zoneIds != null">
+           <if test="zoneIds != null and zoneIds.size > 0">
                and bc3.zone_id in
                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
                    #{id}