From 0ab724c9e00868945417ce77b5e95d0ec6e2b93f Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 21 Jul 2022 14:06:06 +0800
Subject: [PATCH] 行政区域mapper文件

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 42e567f..c794acc 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
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.DictCache;
@@ -41,6 +42,8 @@
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.*;
 import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.lang.entity.Land;
+import org.springblade.modules.lang.service.ILandService;
 import org.springblade.modules.system.entity.*;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.mapper.UserMapper;
@@ -74,6 +77,8 @@
 	private final IUserOauthService userOauthService;
 	private final IRoleService roleService;
 	private final BladeTenantProperties tenantProperties;
+
+	private final ILandService landService;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -433,7 +438,18 @@
 	 * @return
 	 */
 	@Override
-	public List<User> getUserList(User user) {
-		return list(new QueryWrapper<>(user));
+	public List<User> getUserList(UserVO user) {
+		//查询用户信息并返回
+		return baseMapper.getUserList(user);
+	}
+
+	/**
+	 * 根据用户id修改用户信息
+	 * @param user
+	 * @return
+	 */
+	@Override
+	public int updateUserPersonal(User user) {
+		return baseMapper.updateById(user);
 	}
 }

--
Gitblit v1.9.3