Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/graduation/tasks/GraduationAcross.js

@@ -189,7 +189,8 @@ class GraduationAcross extends Component{
               cross_teachers: item.cross_teachers,
               student_id:item.student_id,
               user_name:item.user_name,
-              work_id:item.work_id
+              work_id:item.work_id,
+							cross_groups:item.cross_groups
             }
             return list;
           }),

public/react/src/modules/courses/members/modal/AddAdminModal.js

@@ -96,7 +96,9 @@ class AddAdminModal extends Component{
     }).then((result)=>{
       if(result.data.status==0){
         this.props.showNotification('操作成功。')
+        if (this.props.isCourseAdmin()) {
           window.location.reload()
+        }
         // this.fetchAll()
         this.setVisible(false)
         this.props.changeAdminSuccess && this.props.changeAdminSuccess()

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -222,7 +222,7 @@ export function TPMIndexHOC(WrappedComponent) {
         # 课程权限判断
         ADMIN = 0       # 超级管理员
         BUSINESS = 1    # 运营人员
-        CREATOR = 2     # 课程创建者
+        CREATOR = 2     # 课程创建者   课堂管理员
         PROFESSOR = 3     # 课程老师
         ASSISTANT_PROFESSOR = 4  # 课程助教
         STUDENT = 5     # 学生
@@ -233,6 +233,9 @@ export function TPMIndexHOC(WrappedComponent) {
       isSuperAdmin = () => {
         // return false
         return this.state.coursedata&&this.state.coursedata.course_identity === 0
+      }
+      isCourseAdmin = () => {
+        return this.state.coursedata&&this.state.coursedata.course_identity === 2
       }
 			//超管、运维0-1
 			isClassManagement = () => {
@@ -537,6 +540,8 @@ export function TPMIndexHOC(WrappedComponent) {
             isSuperAdmin:this.isSuperAdmin,
             isAdminOrCreator:this.isAdminOrCreator,
 						isClassManagement:this.isClassManagement,
+						isCourseAdmin:this.isCourseAdmin,
+            
             isAdmin: this.isAdmin,
             isAdminOrTeacher: this.isAdminOrTeacher,
             isStudent: this.isStudent,