From f66630e72727bcf0e46ffd5134fbb2fd88f6ea75 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Dec 2021 18:40:04 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 3 +++
src/main/java/org/springblade/modules/equipage/vo/CarVo.java | 1 +
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 3 +++
3 files changed, 7 insertions(+), 0 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 2d6ec7b..c564968 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -32,6 +32,9 @@
<if test="car.personInCharge!=null and car.personInCharge!=''">
and sc.person_in_charge like concat('%', #{car.personInCharge},'%')
</if>
+ <if test="car.type!=null">
+ and sc.equipment_code is not null
+ </if>
</select>
<!--车辆详情信息-->
diff --git a/src/main/java/org/springblade/modules/equipage/vo/CarVo.java b/src/main/java/org/springblade/modules/equipage/vo/CarVo.java
index 194abb1..3d15d32 100644
--- a/src/main/java/org/springblade/modules/equipage/vo/CarVo.java
+++ b/src/main/java/org/springblade/modules/equipage/vo/CarVo.java
@@ -16,4 +16,5 @@
* 保安单位名称
*/
private String tenantName;
+ private Integer type;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index a0561e9..1c06f2e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -260,6 +260,9 @@
<if test="user.deptId!=null and user.deptId!=''">
and bu.dept_id =#{user.deptId}
</if>
+ <if test="user.type!=null">
+ and bu.equipment_code is not null
+ </if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
--
Gitblit v1.9.3