From 25da56c1fd66728db816a602fa0b719d1a6fca97 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 15 Jul 2021 10:52:16 +0800
Subject: [PATCH] 1.保安员证编码
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 4 ++++
src/main/java/org/springblade/modules/punish/entity/Punish.java | 2 +-
src/main/java/org/springblade/modules/system/entity/User.java | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/punish/entity/Punish.java b/src/main/java/org/springblade/modules/punish/entity/Punish.java
index 1613895..bc01688 100644
--- a/src/main/java/org/springblade/modules/punish/entity/Punish.java
+++ b/src/main/java/org/springblade/modules/punish/entity/Punish.java
@@ -50,7 +50,7 @@
* 单位id
*/
@ApiModelProperty(value = "单位id")
- private Integer deptid;
+ private String deptid;
/**
* 处罚类别 0：警告 1：罚款 2：没收违法所得、没收非法财物 3： 责令停业 4：暂扣或者吊销许可证
*/
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 1e2b301..e2f6261 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -149,6 +149,7 @@
private String rtime;
private String hold;
private String jurisdiction;
+ private String securitynumber;
}
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 4886233..536e90c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -38,6 +38,7 @@
<result column="rtime" property="rtime"/>
<result column="hold" property="hold"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="securitynumber" property="securitynumber"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -68,6 +69,9 @@
</if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
and jurisdiction = #{user.jurisdiction}
</if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and securitynumber = #{user.securitynumber}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
SELECT
--
Gitblit v1.9.3