From ba0f40a308baf294700f3377565ac31f76ce6c08 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 07 Jul 2021 08:53:03 +0800
Subject: [PATCH] 1.保安人员信息调整
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 23 ++++++++++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 1
src/main/java/org/springblade/modules/system/entity/User.java | 53 ++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 3ead456..6251800 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -123,6 +123,7 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ user.setAccount("admin");
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
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 72307b8..68c0b5b 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,7 +16,9 @@
*/
package org.springblade.modules.system.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -94,6 +96,57 @@
* 身份证号
*/
private String cardid;
+ /**
+ * 籍贯
+ */
+ @ApiModelProperty(value = "籍贯")
+ @TableField("nativePlace")
+ private String nativeplace;
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicaloutlook;
+ /**
+ * 身高
+ */
+ @ApiModelProperty(value = "身高")
+ private Float height;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String cell;
+ /**
+ * 邮箱
+ */
+ @ApiModelProperty(value = "邮箱")
+ private String emails;
+ /**
+ * 联系地址
+ */
+ @ApiModelProperty(value = "联系地址")
+ private String address;
+ /**
+ * 户口所在地
+ */
+ @ApiModelProperty(value = "户口所在地")
+ private String registered ;
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private String rtime;
}
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 1380e8e..f7d9843 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -26,6 +26,16 @@
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="cardid" property="cardid"/>
+ <result column="nativeplace" property="nativeplace"/>
+ <result column="nation" property="nation"/>
+ <result column="education" property="education"/>
+ <result column="politicaloutlook" property="politicaloutlook"/>
+ <result column="height" property="height"/>
+ <result column="cell" property="cell"/>
+ <result column="emails" property="emails"/>
+ <result column="address" property="address"/>
+ <result column="registered" property="registered"/>
+ <result column="rtime" property="rtime"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -35,14 +45,23 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and account != #{user.account}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and real_name like concat(concat('%', #{user.realName}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
</if>
+ <if test="user.nativeplace!=null and user.nativeplace != ''">
+ and nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.sex!=null and user.sex != ''">
+ and sex = #{user.sex}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and status = #{user.status}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
SELECT
--
Gitblit v1.9.3