diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index b2c421166..47f9703b7 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -13,7 +13,23 @@ // 初始化表格参数 init: function(options) { $.table._option = options; - $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams; + + //和search查询时条件保持一直 + var currentId = $.common.isEmpty(options.formId) ? $('form').attr('id') : options.formId; + $.table._params = function(params) { + var search = {}; + $.each($("#" + currentId).serializeArray(), function(i, field) { + search[field.name] = field.value; + }); + search.pageSize = params.limit; + search.pageNum = params.offset / params.limit + 1; + search.searchValue = params.search; + search.orderByColumn = params.sort; + search.isAsc = params.order; + return search; + } + + // $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams; _sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder; _sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName; _striped = $.common.isEmpty(options.striped) ? false : options.striped; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java index 92bf2a7ea..e1ad9f9bc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java @@ -65,7 +65,7 @@ public abstract class AbstractBaseServiceImpl, T> implemen @Override public int insertSelective(T entity) { - EntityUtils.setUpdatedInfo(entity); + EntityUtils.setCreateAndUpdateInfo(entity); return mapper.insertSelective(entity); } diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html index 749af3e23..9f3e73ff3 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html @@ -55,9 +55,6 @@ 删除 - - 导出 -
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html index b5a4af8f2..4fd198bca 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html @@ -7,10 +7,10 @@
- +
- +
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html index b6e8da1c6..3c8f0e754 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html @@ -10,9 +10,9 @@
- +
- +
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html index dad4e2789..429ad5d36 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html @@ -31,9 +31,6 @@ 删除 - - 导出 -