From 34f23b9bc07281df4bd454cbfcd3c12a98230afb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 29 一月 2026 15:51:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index bc4fc24..0a9d673 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -178,11 +178,11 @@
@Override
public SysUser selectUserByUserName2(String userName) {
String[] split = userName.split("&");
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], null);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
//鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
SysUserOrg sysUserOrg = new SysUserOrg();
- sysUserOrg.setUserId(sysUser.getUserId());
+ sysUserOrg.setUserId(sysUser.getUserId().toString());
sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
sysUserOrg.setCampusid(split[2].equals("null") ? "" : split[2]);
List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
@@ -298,11 +298,11 @@
if (split[2].contains("null")) {
split[2] = null;
}
- SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[2]);
+ SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);
//鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
SysUserOrg sysUserOrg = new SysUserOrg();
- sysUserOrg.setUserId(sysUser.getUserId());
+ sysUserOrg.setUserId(sysUser.getUserId().toString());
sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
sysUserOrg.setCampusid(split[3].equals("null") ? "" : split[3]);
List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
@@ -471,7 +471,7 @@
@Override
public String checkUserNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+ SysUser info = userMapper.checkUserNameUnique(user);
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -564,7 +564,7 @@
// }
if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
for (String deptCode : user.getDeptCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -590,7 +590,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -673,7 +673,7 @@
// }
if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
for (String deptCode : user.getDeptCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -699,7 +699,7 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(user.getOrgid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
--
Gitblit v1.9.3