Merge branch 'dev-wyf-v1.8.0-goblin' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/artist/GoblinArtistTopicAdminController.java

@@ -70,10 +70,12 @@ public class GoblinArtistTopicAdminController extends BaseController {
             if (aids.isEmpty()) return getDataTable(Collections.emptyList());
             qw.in(GoblinArtistTopic::getArtistId, aids);
         }
-        qw.orderByAsc(GoblinArtistTopic::getSort);
         qw.orderByDesc(GoblinArtistTopic::getCreatedAt);
         startPage();
-        return getDataTable(withNames(topicAdminService.list(qw)));
+        List<GoblinArtistTopic> list = topicAdminService.list(qw);
+        TableDataInfo dataTable = getDataTable(list);
+        dataTable.setRows(withNames(list));
+        return dataTable;
     }
 
     private List<Map<String, Object>> withNames(List<GoblinArtistTopic> list) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/artist/topic/topic.html

@@ -185,8 +185,8 @@
     $(function() {
         $.table.init({
             url: prefix + "/list",
-            sortName: "sort",
-            sortOrder: "asc",
+            sortName: "createdAt",
+            sortOrder: "desc",
             columns: [
                 { field: 'topicId', title: '专题ID' },
                 { field: 'topicName', title: '专题名称' },