Merge branch 'songyuanshuo' into 'master'

2024/12/17接口修改 See merge request !30

Merge branch 'songyuanshuo' into 'master'
2024/12/17接口修改 See merge request !30
80eb2c03 · 宋源硕 · c0830b0f · 5eba1bd0 · 80eb2c03
Commit 80eb2c03 authored Dec 17, 2024 by 宋源硕
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

SysUserServiceImpl.java ...ava/com/ruoyi/system/service/impl/SysUserServiceImpl.java +4 -2

No files found.
--- 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
@@ -80,8 +80,10 @@ public class SysUserServiceImpl implements ISysUserService
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectUserList(SysUser user)
    {
-        if(user.getDeptId() == 100){
+        if (user.getDeptId() != null){
-            return userMapper.selectUserListNew(user);
+            if(user.getDeptId() == 100){
+                return userMapper.selectUserListNew(user);
+            }
        }
        return userMapper.selectUserList(user);
    }