From 6f9ef20f77fb56f3dccdf06575061403662f87bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 Aug 2021 11:43:47 +0800
Subject: [PATCH] 新增用户查询列表
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 34 +++++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 14 +++++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 8 ++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 8 ++++
5 files changed, 75 insertions(+), 0 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 4e7593c..9bb8712 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -132,6 +132,20 @@
/**
+ * 自定义用户列表,
+ */
+ @GetMapping("/pages")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+ IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
+
+ /**
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security")
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 65866a8..89bf7cb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -84,4 +84,12 @@
* @return
*/
List<User> getNotAuditAllUserList();
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ List<User> selectUserPages(IPage<User> page,@Param("user") User user);
}
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 bac4a38..08ba532 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -143,6 +143,40 @@
ORDER BY id
</select>
+ <select id="selectUserPages" resultMap="userResultMap">
+ select * from blade_user where is_deleted = 0
+ <if test="user.realName!=null and user.realName != ''">
+ and real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and dept_id like concat(concat('%', #{user.deptId}),'%')
+ </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.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
+ </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="user.hold!=null and user.hold != ''">
+ and hold = #{user.hold}
+ </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>
+ ORDER BY id
+ </select>
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index ff12388..9b295e2 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -224,4 +224,12 @@
* @return
*/
List<User> getNotAuditAllUserList();
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ IPage<User> selectUserPages(IPage<User> page, User user);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 225aca2..34a35dd 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -453,4 +453,15 @@
public List<User> getNotAuditAllUserList() {
return baseMapper.getNotAuditAllUserList();
}
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ @Override
+ public IPage<User> selectUserPages(IPage<User> page, User user) {
+ return page.setRecords(baseMapper.selectUserPages(page, user));
+ }
}
--
Gitblit v1.9.3