Merge remote-tracking branch 'origin/master'

public/react/config/webpack.config.prod.js

@@ -122,21 +122,21 @@ module.exports = {
 
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-      //
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

public/react/src/modules/courses/members/studentsList.js

@@ -32,6 +32,7 @@ const dataSource = [{
 }];
 
 const buildColumns = (that) => {
+  const { course_groups } = that.state
   const columns=[{
     title: '序号',
     dataIndex: 'id',
@@ -72,14 +73,17 @@ const buildColumns = (that) => {
       return <span className="color-dark overflowHidden1" 
           style={{maxWidth: '110px'}} >{student_id}</span>
     }
-  }, {
-    title: '分班',
-    dataIndex: 'course_group_name',
-    key: 'course_group_name',
-    align:'center',
-    width:"50%",
-    className:"color-grey-6"
   }];
+  if (course_groups && course_groups.length) {
+    columns.push({
+      title: '分班',
+      dataIndex: 'course_group_name',
+      key: 'course_group_name',
+      align:'center',
+      width:"50%",
+      className:"color-grey-6"
+    })
+  }
   const isAdminOrStudent = that.props.isAdminOrStudent()
   if (!isAdminOrStudent) {
     columns.some((item,key)=> {