Merge branch 'songyuanshuo' into 'master'

2024/12/17接口修改

See merge request !30

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -80,9 +80,11 @@ public class SysUserServiceImpl implements ISysUserService
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
+        if (user.getDeptId() != null){
             if(user.getDeptId() == 100){
                 return userMapper.selectUserListNew(user);
             }
+        }
         return userMapper.selectUserList(user);
     }