From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index 1816e1e..7b70ea2 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -5,20 +5,23 @@
<!--车辆分页信息-->
<select id="selectCarPage" resultType="org.springblade.modules.equipage.vo.CarVo">
SELECT
- sc.*,bt.tenant_name AS tenantName
+ sc.*,bt.dept_name AS tenantName
FROM
sys_car sc
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sc.tenant_id = bt.tenant_id
+ sc.dept_id = bt.id
WHERE
1=1
<if test="car.tenantName!=null and car.tenantName!=''">
- and bt.tenant_name like concat('%', #{car.tenantName},'%')
+ and bt.dept_name like concat('%', #{car.tenantName},'%')
</if>
<if test="car.carNumber!=null and car.carNumber!=''">
and sc.car_number like concat('%', #{car.carNumber},'%')
+ </if>
+ <if test="car.deptId!=null and car.deptId!=''">
+ and sc.dept_id = #{car.deptId}
</if>
<if test="car.numberType!=null and car.numberType!=''">
and sc.number_type like concat('%', #{car.numberType},'%')
@@ -34,13 +37,13 @@
<!--车辆详情信息-->
<select id="selectCarInfo" resultType="org.springblade.modules.equipage.vo.CarVo">
SELECT
- sc.*,bt.tenant_name AS tenantName
+ sc.*,bt.dept_name AS tenantName
FROM
sys_car sc
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sc.tenant_id = bt.tenant_id
+ sc.dept_id = bt.id
WHERE
1=1
<if test="car.id!=null">
--
Gitblit v1.9.3