Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 3548f8f669884e1caf9f037a726394464eb85d44

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

@@ -746,8 +746,8 @@
    }

    @Override
    public List<SysUser> selectUserByDeptId(String id) {
        return userMapper.selectUserByDeptId(id);
    public List<SysUser> selectUserByDeptId(List<String> ids) {
        return userMapper.selectUserByDeptId(ids);
    }

    @Override
@@ -764,6 +764,11 @@
    }

    @Override
    public List<SysUser> selectUserByNickName(String nickName) {
        return userMapper.selectUserByNickName(nickName);
    }

    @Override
    public SysUser selectByPhone(String phonenumber) {
        return userMapper.selectByPhone(phonenumber);
    }