From 04f26c9567bdb53ec8a124f6c40af162421d3cfc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 02 四月 2021 17:04:31 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/system/controller/ResourceController.java | 3 +++
src/main/webapp/views/resource/resource.html | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/system/controller/ResourceController.java b/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
index 6880e64..abea96a 100644
--- a/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
+++ b/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
@@ -52,6 +52,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("sort");
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
}
diff --git a/src/main/webapp/views/resource/resource.html b/src/main/webapp/views/resource/resource.html
index 974c274..5714148 100644
--- a/src/main/webapp/views/resource/resource.html
+++ b/src/main/webapp/views/resource/resource.html
@@ -164,6 +164,7 @@
$('.ew-tree-table-box').css('height', '100%');
// insTb.expandAll();
tbDataList = data;
+ limit();
}
});
--
Gitblit v1.9.1