Merge remote-tracking branch 'origin/bww-v1'

src/models/createtheme.js

@@ -776,9 +776,7 @@ export default {
     },
     * calculatecalendar({ payload }, { call, put, select }) {
       const { currentTimestamp, judgetodaycurrentTimestamp } = payload;
-      console.log(payload, 'payload');
       const calendarData = calendar(currentTimestamp, judgetodaycurrentTimestamp);
-      console.log(calendarData, 'calendarData');
       yield put({
         type: 'updateState',
         payload: {

src/models/teachers.js

@@ -380,6 +380,20 @@ export default {
       const { class_ids, callBack } = value;
       const { teacher_id, submitting } = yield select(state => state.teachers);
       const { sid } = yield select(state => state.webapp);
+      if (class_ids === undefined) {
+        yield put({
+          type: 'updateState',
+          payload: {
+            chooseClassVisible: false,
+            teacher_id: 0,
+            allClassList: [],
+          },
+        });
+        if (callBack && (typeof callBack == 'function')) {
+          callBack();
+        }
+        return;
+      }
       if (submitting) {
         return;
       }