From b012e228f751102a04aba440e23d4c5e70ca6262 Mon Sep 17 00:00:00 2001
From: zhujj <Administrator@G6DKBNY0IH0AICJ>
Date: Thu, 10 Jan 2019 11:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9B=B8=E5=85=B3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A5=E5=8F=8A=E5=B0=81=E8=A3=85=E7=9A=84table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/ry-ui.js    | 18 +++++++++++++++++-
 .../web/base/AbstractBaseServiceImpl.java      |  2 +-
 .../train/course/trainCourse/trainCourse.html  |  3 ---
 .../train/course/trainCourseSection/add.html   |  4 ++--
 .../train/course/trainCourseSection/edit.html  |  4 ++--
 .../trainCourseSection/trainCourseSection.html |  3 ---
 6 files changed, 22 insertions(+), 12 deletions(-)

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<M extends MyMapper<T>, 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 @@
 				<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="train:trainCourse:remove">
 					<i class="fa fa-remove"></i> 删除
 				</a>
-				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="train:trainCourse:export">
-						<i class="fa fa-download"></i> 导出
-				 </a>
 			</div>
 			<div class="col-sm-12 select-table table-striped">
 				<table id="bootstrap-table" data-mobile-responsive="true"></table>
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 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-trainCourseSection-add">
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">课程ID：</label>
+				<label class="col-sm-3 control-label">课程名称：</label>
 				<div class="col-sm-8">
 					<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
-					<input  th:value="${trainCourse.name}" class="form-control" type="text">
+					<input  th:value="${trainCourse.name}" class="form-control" type="text" disabled="disabled">
 				</div>
 			</div>
 			<div class="form-group">	
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 @@
 
 			<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">课程ID：</label>
+				<label class="col-sm-3 control-label">课程名称：</label>
 				<div class="col-sm-8">
-					<input  th:value="${trainCourse.name}" class="form-control" type="text">
+					<input  th:value="${trainCourse.name}" class="form-control" type="text" disabled="disabled">
 				</div>
 			</div>
 			<div class="form-group">	
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 @@
 				<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="train:trainCourseSection:remove">
 					<i class="fa fa-remove"></i> 删除
 				</a>
-				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="train:trainCourseSection:export">
-						<i class="fa fa-download"></i> 导出
-				 </a>
 			</div>
 			<div class="col-sm-12 select-table table-striped">
 				<table id="bootstrap-table" data-mobile-responsive="true"></table>