From c26efae2e6147535bd56ded92a4d9c7403300d7e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 26 Nov 2021 16:34:47 +0800
Subject: [PATCH] 用户新增押运人员设备编号
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 3 +++
src/main/java/org/springblade/modules/system/entity/User.java | 6 ++++++
src/main/java/org/springblade/modules/system/vo/UserVO.java | 3 +++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 58afc55..bc7abef 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -221,5 +221,11 @@
@TableField("audit_time")
private Date auditTime;
+ /**
+ * 押运人员设备编号
+ */
+ @TableField("equipment_code")
+ private String equipmentCode;
+
}
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 519b3dc..11635d5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -258,6 +258,9 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
+ <if test="user.type!=null">
+ and bu.equipment_code !="" and bu.equipment_code is not null and bu.equipment_code !=null
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index aaba07f..dfac650 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -105,4 +105,7 @@
*/
private String endTime;
private String score;
+
+
+ private Integer type;
}
--
Gitblit v1.9.3