From 9cdab7bf6394ca1ef3b26ba1d38c168d1a413468 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:57 +0800
Subject: [PATCH] 1.押运

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

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 b6e9c08..027806e 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
@@ -52,10 +52,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
 
@@ -423,8 +420,8 @@
 	}
 
 	@Override
-	public void updateUser(String hold, String cardid,String holdv,String time) {
-		baseMapper.updateUser(hold, cardid,holdv,time);
+	public void updateUser(String hold, String cardid, String holdv, String time) {
+		baseMapper.updateUser(hold, cardid, holdv, time);
 	}
 
 
@@ -438,6 +435,7 @@
 
 	/**
 	 * 查询所有未注销用户
+	 *
 	 * @return
 	 */
 	@Override
@@ -447,6 +445,7 @@
 
 	/**
 	 * 查询用户数据,未删除的,未审核的
+	 *
 	 * @return
 	 */
 	@Override
@@ -456,6 +455,7 @@
 
 	/**
 	 * 自定义列表,...
+	 *
 	 * @param page
 	 * @param user
 	 * @return
@@ -467,6 +467,7 @@
 
 	/**
 	 * 根据保安员编码查询保安员信息
+	 *
 	 * @param securityNumber
 	 * @return
 	 */
@@ -486,4 +487,11 @@
 	public User getUserInfoByIdCardNo(String idCardNo) {
 		return baseMapper.getUserInfoByIdCardNo(idCardNo);
 	}
+
+	@Override
+	public List selectPeo(UserVO user) {
+		return baseMapper.selectPeo(user);
+	}
+
+
 }

--
Gitblit v1.9.3