diff --git a/cyx-admin/src/main/resources/templates/base/personnel/add.html b/cyx-admin/src/main/resources/templates/base/personnel/add.html index e318707..80cf8a5 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/add.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/add.html @@ -121,19 +121,21 @@ focusCleanup: true }); - $.ajax({ - type: "post", - url: ctx + "base/personnel/deptList", - data: { - }, - success: function(data) { - var opt = ''; - data.data.forEach(d=>{ - opt += ''; - }) - $("#deptId")[0].innerHTML=opt; - } - }); + $(document).ready(function () { + $.ajax({ + type: "post", + url: ctx + "base/personnel/deptList", + data: { + }, + success: function(data) { + var opt = ''; + data.data.forEach(d=>{ + opt += ''; + }) + $("#deptId")[0].innerHTML=opt; + } + }); + }) function submitHandler() { if ($.validate.form()) { diff --git a/cyx-admin/src/main/resources/templates/base/personnel/edit.html b/cyx-admin/src/main/resources/templates/base/personnel/edit.html index 5ca1cad..e1b34ef 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/edit.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/edit.html @@ -115,9 +115,10 @@ focusCleanup: true }); - refresh() - - function refresh(){ + $(document).ready(function () { + $("#deptId").on("change", function() { + console.log($(this).val()) + }); $.ajax({ type: "post", url: ctx + "base/personnel/deptList", @@ -128,10 +129,10 @@ data.data.forEach(d=>{ opt += ''; }) - $("#deptId")[0].innerHTML=opt; + $("#deptId").html(opt); } }); - } + }) function submitHandler() { if ($.validate.form()) { diff --git a/cyx-common/src/main/java/com/cyx/common/core/page/PageDomain.java b/cyx-common/src/main/java/com/cyx/common/core/page/PageDomain.java index 56bde91..69b3d84 100644 --- a/cyx-common/src/main/java/com/cyx/common/core/page/PageDomain.java +++ b/cyx-common/src/main/java/com/cyx/common/core/page/PageDomain.java @@ -22,7 +22,7 @@ public class PageDomain private String isAsc = "asc"; /** 分页参数合理化 */ - private Boolean reasonable = true; + private Boolean reasonable = false; public String getOrderBy() { diff --git a/cyx-common/src/main/java/com/cyx/common/utils/PageUtils.java b/cyx-common/src/main/java/com/cyx/common/utils/PageUtils.java index fa64c65..b474073 100644 --- a/cyx-common/src/main/java/com/cyx/common/utils/PageUtils.java +++ b/cyx-common/src/main/java/com/cyx/common/utils/PageUtils.java @@ -31,9 +31,12 @@ public class PageUtils extends PageHelper public static void startPage(Integer pageNum,Integer pageSize) { PageDomain pageDomain = TableSupport.buildPageRequest(); - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - Boolean reasonable = pageDomain.getReasonable(); - PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + //Boolean reasonable = pageDomain.getReasonable(); + PageHelper.startPage(pageNum, pageSize, orderBy); + } } /**