From 23ea6c8a9488b2d271a2389e2992ce7baefc77d9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 11:46:44 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 1b35d08..89bf7cb 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;
@@ -66,11 +70,26 @@
/**
* 自定义用户列表(只有保安员)
*/
- List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ @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);
}
--
Gitblit v1.9.3