Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

src/main/java/org/rcisoft/business/bslschedule/dao/BSlScheduleRepository.java

@@ -24,10 +24,10 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
     @ResultMap(value = "BaseResultMap" )
     List<BSlSchedule> queryBSlSchedules(BSlSchedule bSlSchedule);
 
-    @Select("<script>select *, s_user.name as teacherName,"
+    @Select("<script>select *, s_user.name as teacherName,b_lesson.class_hour as classHour,"
             + "b_agency.name as agencyName,b_agency.code as agencyCode,b_agency.business_id as agencyId, \n"
             + "b_lesson.code as lessonCode,b_direction.name as directionName,b_direction.code as directionCode, \n"
-            + "b_sl.code as bslCode,s_user.name as userName, \n"
+            + "b_sl.code as bslCode, \n"
             + "(select sum(student_num) from b_class where FIND_IN_SET(b_class.code,b_edu_class.classes_id)) AS studentNum from b_sl_schedule "
             + "left join b_sl on b_sl_schedule.tea_code = b_sl.teacher_code and b_sl_schedule.term_code = b_sl.term_code and b_sl_schedule.lesson_code = b_sl.lesson_code \n"
             + "left join b_edu_class on b_edu_class.code = b_sl_schedule.edu_class_code \n"

src/main/java/org/rcisoft/business/bslschedule/entity/BSlSchedule.java

@@ -94,5 +94,8 @@ public class BSlSchedule  extends IdEntity<BSlSchedule> {
 
      @Transient
      private String teacherName;
+
+     @Transient
+     private String classHour;
 }
 

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -28,7 +28,8 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      */
     @Select("<script>select * from s_role where flag = '1' and del_flag = '0' "
     		+ " <if test=\"code !=null and code != ''\">and code = #{code} </if> "
-            + " <if test=\"roleName !=null and roleName != ''\">and role_name = #{roleName} </if> "
+            + " <if test=\"roleName !=null and roleName != ''\">and role_name = #{roleName} </if> " +
+            " and code NOT in ('ROLE_1001','ROLE_1002','ROLE_1003')"
             + " order by create_date desc"
     		+ "</script>")
     @ResultMap(value = "SelectAllAndUserNum" )