网关日志限制修改

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

@@ -158,10 +158,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     return RestResponse.suc();
                 }
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                if(companyList.contains(vehicleBookRecordQueryVo.getLiftCompany())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
+                    companyList.clear();
+                    companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+                } else {
+                    return RestResponse.suc();
+                }
+            }
         } else {
             if(vehicleBookRecordQueryVo.getCompanyId() != null) {
                 companyList.add(vehicleBookRecordQueryVo.getCompanyId());
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+            }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);

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

@@ -425,11 +425,14 @@
                 and v1.book_type = #{bookType}
             </if>
             <if test="companyIds != null and companyIds.size > 0">
-                and v1.lift_company in
+                and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-
+                or v1.ret_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>)
             </if>
             and v1.status between 1 and 2 and v1.book_user != -2
         </where>