From 7de1396e315896dbc72a9d54e44f77434ea90f18 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 14 十二月 2025 23:47:34 +0800
Subject: [PATCH] feat:增加企业微信自动登录
---
ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
index 89ef050..fc52b17 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
@@ -27,7 +27,8 @@
t.task_code, t.task_type
from sys_task_vehicle tv
left join tb_vehicle_info v on tv.vehicle_id = v.vehicle_id
- left join sys_dept d on v.dept_id = d.dept_id
+ left join tb_vehicle_dept vd on v.vehicle_id = vd.vehicle_id
+ left join sys_dept d on vd.dept_id = d.dept_id
left join sys_task t on tv.task_id = t.task_id
</sql>
@@ -35,7 +36,9 @@
<include refid="selectSysTaskVehicleVo"/>
<where>
<if test="taskId != null "> and tv.task_id = #{taskId}</if>
+ <if test="taskCode != null and taskCode != ''"> and t.task_code like concat('%', #{taskCode}, '%')</if>
<if test="vehicleId != null "> and tv.vehicle_id = #{vehicleId}</if>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no like concat('%', #{vehicleNo}, '%')</if>
<if test="status != null and status != ''"> and tv.status = #{status}</if>
<if test="assignBy != null and assignBy != ''"> and tv.assign_by like concat('%', #{assignBy}, '%')</if>
</where>
@@ -117,4 +120,4 @@
<delete id="deleteSysTaskVehicleByTaskIdAndVehicleId">
delete from sys_task_vehicle where task_id = #{taskId} and vehicle_id = #{vehicleId}
</delete>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1