11.10修改年级实验室预约列表

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java

@@ -277,8 +277,9 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen
         wrapper.eq(SchoolGradeMentor::getGradeId,gradeId)
                 .eq(SchoolGradeMentor::getTeacherId,user.getUserId());
         SchoolGradeMentor schoolGradeMentor = schoolGradeMentorMapper.selectOne(wrapper);
+        //无学科组返回提示
         if (StringUtils.isBlank(schoolGradeMentor.getSubGroup())){
-            return schoolLabMapper.getSubAll();
+            throw new ServiceException("您还未加入学科组！");
         }
         if (schoolGradeMentor.getSubGroup().equals("1")){
             list.add(schoolLabMapper.getSub("1"));

smart-campus/src/main/resources/mapper/schoolLab/SchoolLabClassYearMapper.xml

@@ -45,7 +45,7 @@
     </sql>
 
     <select id="selectSchoolLabClassYearList" parameterType="SchoolLabClassYearVo" resultMap="SchoolLabClassYearVoResult">
-        select lcy.id, lcy.experiment_plan_id, lcy.experiment_name, lcy.grade_id, lcy.grade,
+        select DISTINCT lcy.id, lcy.experiment_plan_id, lcy.experiment_name, lcy.grade_id, lcy.grade,
         lcy.school_year, lcy.semester, lcy.sub, lcy.experiment_classify, lcy.planned_start_time,
         lcy.planned_end_time, lcy.chapter_content, lcy.experiment_use_goods, lcy.declare_state, lcy.apply_id,
         lcy.apply_name, lcy.apply_time, lcy.create_by, lcy.create_time, lcy.update_by, lcy.update_time, lcy.del_flag