From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/sys/UserService.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index 4ab733a..2301bee 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -37,10 +37,11 @@
private final static Log log = LogFactory.getLog(UserService.class);
@Override
- public Integer selectCount(String uname, Integer depid) {
- uname = StringHelper.getLikeStr(uname);
+ public Integer selectCount(String uname, String depcode) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectCount(uname, depid);
+ return userMapper.selectCount(uname, depcode);
}
@Override
@@ -59,10 +60,11 @@
}
@Override
- public List<UserEntity> selectByPage(String uname, Integer depid, Integer limit, Integer offset) {
- uname = StringHelper.getLikeStr(uname);
+ public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectByPage(uname, depid, limit, offset);
+ return userMapper.selectByPage(uname, depcode, limit, offset);
}
@Override
@@ -111,22 +113,24 @@
}
@Override
- public Integer updateUsers(UserEntity userEntity) {
- return userMapper.updateUsers(userEntity);
+ public Integer updateUser(UserEntity userEntity) {
+ return userMapper.updateUser(userEntity);
}
@Override
- public Integer selectCountForRole(String uname, Integer roleid, Integer depid) {
- uname = StringHelper.getLikeStr(uname);
+ public Integer selectCountForRole(String uname, Integer roleid, String depcode) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectCountForRole(uname, roleid, depid);
+ return userMapper.selectCountForRole(uname, roleid, depcode);
}
@Override
- public List<UserEntity> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer limit, Integer offset) {
- uname = StringHelper.getLikeStr(uname);
+ public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectByPageForRole(uname, roleid, depid, limit, offset);
+ return userMapper.selectByPageForRole(uname, roleid, depcode, limit, offset);
}
@Override
--
Gitblit v1.9.3