Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/views/yqrange/checkBlackList.vue

@@ -440,7 +440,7 @@ export default {
     },
     selectableTableList(row, index) {
       // if (this.status4Flag == 1) {
-      if (row.status == 2) {
+      if (row.status == 2 || !(row.roleId == null || row.roleId == 0)) {
         return false;
       }
       return true;