Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-16 a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64

 src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java

@@ -187,8 +187,13 @@
    }

    @Override
    public List<Integer> getDeptAdminIds(Integer id) {
        return userMapper.getDeptAdminIds(id);
    public List<Integer> getDeptAdminIds(Integer userId) {
        return userMapper.getDeptAdminIds(userId);
    }

    @Override
    public List<Department> getDeptAdminIdAndInfo(Integer userId) {
        return userMapper.getDeptAdminIdAndInfo(userId);
    }

    @Override