From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 5f31e34..e8e2714 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -145,7 +145,7 @@
 	}
 
 	@Override
-	public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
+	public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
 //		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		if (deptId != null){
 			String arr =deptId.toString();
@@ -419,4 +419,14 @@
 	public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
 		return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
 	}
+
+	/**
+	 * 根据用户编号查询用户新
+	 * @param code 用户编号
+	 * @return
+	 */
+	@Override
+	public User selUserByCode(String code) {
+		return baseMapper.selUserByCode(code);
+	}
 }

--
Gitblit v1.9.3