From 7e2b53b65b7e8ce4549c5201fd6f5848cef26a28 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 5 Jul 2019 10:01:00 +0800
Subject: [PATCH 1/2] isAdminOrTeacher

---
 public/react/src/modules/courses/members/teacherList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 5f2459dd3..c0c450ac0 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -174,7 +174,7 @@ function buildColumns(that) {
       },
     })
   }
-  if(isAdmin && hasGraduationModule) {
+  if(isAdminOrTeacher && hasGraduationModule) {
     columns.unshift({
     title: '',
     dataIndex: 'course_member_id',
@@ -594,7 +594,7 @@ class studentsList extends Component{
         `}</style>
         <div className="mt20 edu-back-white padding20 teacherList">
           <div className="clearfix stu_head" style={{paddingLeft: '15px'}}>
-            { isAdmin && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox> }
+            { isAdminOrTeacher && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox> }
             { <div className="studentList_operation_ul">
               { hasGraduationModule && isAdminOrTeacher && <li className="li_line drop_down">
                 加入答辩组<i className="iconfont icon-xiajiantou font-12 ml2"></i>

From eeb799b9f2aedfdd12fc7c6aa116de6af7145efc Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 5 Jul 2019 10:23:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/members/studentsList.js    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 26fa8984e..07c828d5b 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -462,9 +462,9 @@ class studentsList extends Component{
       checkBoxValues,
       checkAllValue
     }=this.state;
-    let currentOrderName = '学生学号'
+    let currentOrderName = '学生学号排序'
     if (order == ORDER_BY_GROUP) {
-      currentOrderName = '分班名称'
+      currentOrderName = '分班名称排序'
     } 
     const { coursesids } = this.props
     const course_group_id = this.props.match.params.course_group_id
@@ -625,12 +625,18 @@ class studentsList extends Component{
                     }
                   </ul>
                 </li>}
+                
                 <li className="drop_down">
-                  {currentOrderName}<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                  <ul className="drop_down_normal">
-                    <li onClick={() => this.onSortTypeChange(ORDER_BY_NUM)} >学生学号</li>
-                    <li onClick={() => this.onSortTypeChange(ORDER_BY_GROUP)} >分班名称</li>
+                  {currentOrderName}
+                  { course_groups && !!course_groups.length && 
+                  <React.Fragment>
+                  <i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  <ul className="drop_down_normal" style={{width: '124px'}}>
+                    <li onClick={() => this.onSortTypeChange(ORDER_BY_NUM)} >学生学号排序</li>
+                    <li onClick={() => this.onSortTypeChange(ORDER_BY_GROUP)} >分班名称排序</li>
                   </ul>
+                  </React.Fragment>
+                   }
                 </li>
               </div>
             </div>