From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
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 669a635..dda2ef2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -16,12 +16,16 @@
*/
package org.springblade.modules.system.mapper;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.vo.UserVO;
+import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
import java.util.List;
@@ -63,4 +67,36 @@
void updateUser(String hold,String cardid);
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @SqlParser(filter = true)
+ List<UserVO> selectUserPageSecurity(IPage<UserVO> page, @Param("user") UserVO user);
+
+ /**
+ * 查询所有未注销用户
+ * @return
+ */
+ List<User> getAllUserList();
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ List<User> getNotAuditAllUserList();
+
+ /**
+ * 自定义列表，...
+ * @param page
+ * @param user
+ * @return
+ */
+ List<User> selectUserPages(IPage<User> page,@Param("user") User user);
+
+ /**
+ * 根据保安员编码查询保安员信息
+ * @param securityNumber
+ * @return
+ */
+ UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
}
--
Gitblit v1.9.3