Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/education/modules/base/service/impl/ScheduleSheetServiceImpl.java

@@ -181,20 +181,25 @@ public class ScheduleSheetServiceImpl implements ScheduleSheetService {
 										//设置上课整点小时
 										if (coursePeriods.length == 2) {
 
-											int start = Integer.parseInt(coursePeriods[0]);
-											int end = Integer.parseInt(coursePeriods[1]);
+											String[] startArr = coursePeriods[0].split(":");
+											String[] endArr = coursePeriods[1].split(":");
 
-											String courseHour = "";
+											if(startArr.length>0&&endArr.length>0){
+												int start = Integer.parseInt(startArr[0]);
+												int end = Integer.parseInt(endArr[0]);
 
-											while (start != end) {
-												courseHour += String.valueOf(start) + ",";
-												start++;
-											}
+												String courseHour = "";
+
+												while (start != end) {
+													courseHour += String.valueOf(start) + ",";
+													start++;
+												}
 
-											if(StringUtils.isNotEmpty(courseHour)){
-												courseHour = courseHour.substring(0,courseHour.lastIndexOf(","));
+												if(StringUtils.isNotEmpty(courseHour)){
+													courseHour = courseHour.substring(0,courseHour.lastIndexOf(","));
+												}
+												scheduleSheet.setCourseHour(courseHour);
 											}
-											scheduleSheet.setCourseHour(courseHour);
 										}
 									}
 

common/src/main/resources/mapper/base/CourseSort.xml

@@ -72,7 +72,7 @@
 		select count(*) from t_course_sort where id_=#{0}
 	</select>
 	<select id="list" resultMap="CourseSortMap">
-		select * from t_course_sort
+		select * from t_course_sort where del_if=false
 	</select>
 	<select id="findParentId" resultMap="CourseSortMap">
 		select * from t_course_sort where del_if=false and parent_id = #{0} order by create_time desc

web/src/main/resources/application.yml

@@ -108,8 +108,9 @@ pagehelper:
 wechat:
 #  appId: wx0b3c41a903053808
 #  appSecret: 43557bd62f77b0c3d6670e991872f0e7
-  appId: wx7e70eb62a8459869
-  appSecret: 909d17e353268da57c4f18cc09798049
+#  荆鹏集团公众号
+  appId: wxe598c699aa68cffe
+  appSecret: ea20d2e9a36aace26b4f7654218129af
   tokenUrl: "http://ykt.xiaoxinda.com/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"
   backNoticeTemplateId: "Ya2TByTerPfIxfqMwfFq2G-BMsuyWZOslk-g5cHSWfs"
 oss: