From 5ddc9b524c221277c8878be5fd9ec62a34af17b2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 10 Jul 2021 00:31:57 +0800
Subject: [PATCH] 1.派遣单位，招聘，装备，车辆，枪支 修改绑定值为 deptId 2. 用户page接口修改，新增查询条件
---
src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
index 9bbd43c..4d1c16d 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
@@ -5,17 +5,17 @@
<!--枪支分页信息-->
<select id="selectGunPage" resultType="org.springblade.modules.equipage.vo.GunVo">
SELECT
- sg.*,bt.tenant_name AS tenantName
+ sg.*,bt.dept_name AS tenantName
FROM
sys_gun sg
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sg.tenant_id = bt.tenant_id
+ sg.dept_id = bt.id
WHERE
1=1
<if test="gun.tenantName!=null and gun.tenantName!=''">
- and bt.tenant_name like concat('%', #{gun.tenantName},'%')
+ and bt.dept_name like concat('%', #{gun.tenantName},'%')
</if>
<if test="gun.gunCardNumber!=null and gun.gunCardNumber!=''">
and sg.gun_card_number like concat('%', #{gun.gunCardNumber},'%')
@@ -34,13 +34,13 @@
<!--枪支详情信息-->
<select id="selectGunInfo" resultType="org.springblade.modules.equipage.vo.GunVo">
SELECT
- sg.*,bt.tenant_name AS tenantName
+ sg.*,bt.dept_name AS tenantName
FROM
sys_gun sg
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sg.tenant_id = bt.tenant_id
+ sg.dept_id = bt.id
WHERE
1=1
<if test="gun.id!=null">
--
Gitblit v1.9.3