Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -181,7 +181,30 @@

    List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);

    List<SysUser> selectUserByDeptId(@Param("id")String id);
    List<SysUser> selectUserByDeptId(@Param("ids")List<String> ids);

    List<TaskFinishListVO> pageListReport(@Param("query")DataReportQuery query, @Param("pageInfo")PageInfo<TaskFinishListVO> pageInfo);

    /**
     * 通过部门id查询用户
     * @param deptId
     * @return
     */
    List<SysUser> selectListByDeptId(@Param("deptId")String deptId);

    /**
     * 通过部门类型查询用户
     * @param deptType
     * @return
     */
    List<SysUser> selectListByDeptType(@Param("deptType")Integer deptType);

    /**
     *  通过部门id查询用户
     * @param projectIds
     * @return
     */
    List<SysUser> selectListByDeptIds(@Param("projectIds")List<String> projectIds);

    Integer selectUserCount(@Param("projectIds")List<String> projectIds, @Param("deptType")Integer deptType);
}