From 9f88b12d16c83963dad8fb8f79d9eeba2c311518 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 八月 2024 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java b/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
index c62540b..4207d5a 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
@@ -20,7 +20,10 @@
*/
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-
+ @Override
+ public List<Map<String, Object>> getUsers(String phone,String name,String deptName) {
+ return this.baseMapper.getUsers(phone,name,deptName);
+ }
@Override
public int setStatus(Integer userId, int status) {
return this.baseMapper.setStatus(userId, status);
@@ -50,10 +53,5 @@
public Map<String,Object> getSysUserDetails(Integer id) {
return this.baseMapper.getSysUserDetails(id);
- }
-
- @Override
- public List<Map<String, Object>> getUsers(String account) {
- return this.baseMapper.getUsers(account);
}
}
--
Gitblit v1.7.1