Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -287,8 +287,16 @@
     */
    List<SysUser> selectListByDeptIds(List<String> projectIds);

    List<SysUser> selectUserByDeptId(String id);
    List<SysUser> selectUserByDeptId(List<String> ids);

    PageInfo<TaskFinishListVO> pageListReport(DataReportQuery dataReportQuery);

    /**
     * 查询部门类型下的人员数量
     * @param projectId
     * @param deptType
     * @return
     */
    Integer selectUserCount(List<String> projectId, Integer deptType);

}