模块数据隔离，bug修改

Signed-off-by: lSun <15893999301@qq.com>

bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/controller/ProDeptRoleController.java

@@ -55,7 +55,7 @@ public class ProDeptRoleController extends BaseController {
             //管理员与人资角色可以看到所有
             if (roleId != null && !roleId.isEmpty()) {
                 if (Collections.frequency(roleId, "1") == 0 && Collections.frequency(roleId, "16") == 0) {
-                    // 根据用户id查询是否是管理员或帮忙负责人
+                    // 根据用户id查询是否是管理员或部门负责人
                     Long userId = SecurityUtils.getUserId();
                     List<MapVo> orgList = sysOrgDao.getOrgIdList(userId);
                     if (!orgList.isEmpty()) {

bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml

@@ -77,6 +77,7 @@
 
     <select id="getHolidayList" resultType="com.bonus.system.holiday.entity.HolidayBean" parameterType="com.bonus.system.holiday.entity.HolidayBean">
         SELECT
+        DISTINCT
         la.id,
         la.user_id,
         la.user_name,