Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -160,6 +160,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         String prePath = "file/preview/";
         String newName = genPreviewPath(rootPath, prePath, entity.getSamplePath());
         entity.setPreViewPath(prePath + newName);
+        int sort = this.count(new MatterDatumQuery(), context);
+        entity.setSort(sort);
+
         super.saveBefore(entity, context);
     }
 

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -67,6 +67,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
         List<OrderCol> orderColList = new ArrayList<>();
         orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
+        orderColList.add(new OrderCol("sort", OrderCol.DESCENDING));
         orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
         query.setOrderColList(orderColList);
         super.doListBefore(query, model, context);