update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2265,31 +2265,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>(16);
         MapUtil.populateMap(params, queryInfo);
-        Set<Integer> courseScheduleIdSet = new HashSet<>();
-
-        if(StringUtils.isNotBlank(queryInfo.getSearch())||StringUtils.isNotBlank(queryInfo.getOrganIdList())){
-//            params.put("musicGroupStatus", MusicGroupStatusEnum.PROGRESS);
-//            params.put("vipGroupStatus", VipGroupStatusEnum.PROGRESS);
-            //获取相关的乐团和vip课集合
-            courseScheduleIdSet.addAll(courseScheduleDao.queryMusicCourseScheduleIds(params));
-            courseScheduleIdSet.addAll(courseScheduleDao.queryVipCourseScheduleIds(params));
-            if(courseScheduleIdSet.size() > 0){
-                params.put("courseScheduleIds", courseScheduleIdSet);
-            }
-            /*List<Group> groups = groupDao.searchGroups(params);
-            if(groups != null && groups.size() > 0){
-                params.put("groups", groups);
-            }
-            //通过search获取相关学员课程
-            Set<Integer> studentCourseIds=courseScheduleDao.findCourseIdsByStudent(queryInfo.getSearch());
-            //通过search获取相关老师课程
-            Set<Integer> teacherCourseIds=courseScheduleDao.findCourseIdsByTeacher(queryInfo.getSearch());
-            studentCourseIds.addAll(teacherCourseIds);
-            if(studentCourseIds.size() > 0){
-                params.put("courseIds", studentCourseIds);
-            }*/
-        }
-
         if(StringUtils.isNotBlank(queryInfo.getTeacherName())){
             List<TeacherBasicDto> teachers = teacherDao.searchTeachers(params);
             if(!CollectionUtils.isEmpty(teachers)){
@@ -2297,7 +2272,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 params.put("teacherIdList",StringUtils.join(teacherIds.toArray(),","));
             }
         }
-
+        Set<Integer> courseScheduleIdSet = new HashSet<>();
+        courseScheduleIdSet.addAll(courseScheduleDao.queryMusicCourseScheduleIds(params));
+        courseScheduleIdSet.addAll(courseScheduleDao.queryVipCourseScheduleIds(params));
+        if(courseScheduleIdSet.size() == 0){
+            return pageInfo;
+        }
+        params.put("courseScheduleIds", courseScheduleIdSet);
         List<CourseScheduleEndDto> results = new ArrayList<>();
         int count = courseScheduleDao.endCountCourseSchedules(params);
         if (count > 0) {

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -1929,9 +1929,6 @@
                     #{courseId}
                 </foreach>
             </if>
-            <if test="teacherIdList != null">
-                AND FIND_IN_SET(cs.actual_teacher_id_,#{teacherIdList})
-            </if>
         </where>
     </sql>
 
@@ -2061,6 +2058,9 @@
         <if test="schoolId!=null">
             AND cs.schoole_id_ = #{schoolId}
         </if>
+        <if test="teacherIdList != null">
+            AND FIND_IN_SET(cs.actual_teacher_id_,#{teacherIdList})
+        </if>
     </sql>
     <select id="queryVipCourseScheduleIds" resultType="java.lang.Integer">
         SELECT cs.id_ FROM course_schedule cs

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -272,9 +272,18 @@ public class CourseScheduleController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        Employee employee = employeeDao.get(sysUser.getId());
-        if(StringUtils.isEmpty(queryInfo.getOrganIdList())&&Objects.nonNull(employee)){
-            queryInfo.setOrganIdList(employee.getOrganIdList());
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+                queryInfo.setOrganIdList(employee.getOrganIdList());
+            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                    return failed("非法请求");
+                }
+            }
         }
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }