From 6810a3f59a8a930f67e4dfba9ebad1d147df7196 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Sep 2021 14:25:19 +0800
Subject: [PATCH] 启动端口修改
---
src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml | 17 ++++++++++-------
1 files changed, 10 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..b7d87ce 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,20 @@
<!--枪支分页信息-->
<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.deptId!=null and gun.deptId!=''">
+ and sg.dept_id = #{gun.deptId}
</if>
<if test="gun.gunCardNumber!=null and gun.gunCardNumber!=''">
and sg.gun_card_number like concat('%', #{gun.gunCardNumber},'%')
@@ -34,13 +37,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