Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/assets/javascripts/admins/laboratory_subjects/index.js

@@ -107,7 +107,7 @@ $(document).on('turbolinks:load', function() {
       },
       templateResult: function (item) {
         if(!item.id || item.id === '') return item.text;
-        var ele = '<span>'
+        var ele = '<span>';
         ele += '<span>' + item.name + '</span>';
         ele += '<span class="font-12"> -- ' + item.creator_name + '</span>';
         ele += '<span class="font-12"> -- ' + item.status_text+ '</span>';
@@ -116,10 +116,9 @@ $(document).on('turbolinks:load', function() {
         return $(ele);
       },
       templateSelection: function(item){
-        if (item.id) {
-        }
-        var ele = '<span>' + (item.name || item.text) + '<span class="font-12"> -- ' + item.creator_name + '</span></span>'
-        return $(ele);
+          if(!item.id || item.id === '') return item.text;
+          var ele = '<span>' + (item.name || item.text) + '<span class="font-12"> -- ' + item.creator_name + '</span></span>';
+          return $(ele);
       }
     });