Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -801,11 +801,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         boolean checkTeacherLeaveDate = true;
         SysConfig allTeacherLeaveDataConfig = sysConfigService.findByParamName(SysConfigService.TEACHER_LEAVE_DATA);
         JSONObject allTeacherLeaveData = JSONObject.parseObject(allTeacherLeaveDataConfig.getParanValue());
-        JSONObject organTeacherLeaveData = null;
-        if (Objects.nonNull(allTeacherLeaveData)) {
-            organTeacherLeaveData = allTeacherLeaveData.getJSONObject(teacher.getOrganId().toString());
-        }
-        if (Objects.isNull(organTeacherLeaveData)) {
+        if (Objects.isNull(allTeacherLeaveData)) {
             checkTeacherLeaveDate = false;
         }
 
@@ -852,12 +848,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        if (Objects.nonNull(organTeacherLeaveData)) {
-            checkTeacherLeaveDate = true;
-        }
         JSONObject teacherLeaveData = null;
         if (checkTeacherLeaveDate) {
-            teacherLeaveData = organTeacherLeaveData.getJSONObject(teacherId.toString());
+            teacherLeaveData = allTeacherLeaveData.getJSONObject(teacherId.toString());
         }
 
         if (Objects.isNull(teacherLeaveData)) {