From 3b639dc737354a7bcf12a537dc0bdd678ad206d6 Mon Sep 17 00:00:00 2001
From: songanwei <songanwei@sinoiov.com>
Date: Mon, 16 Nov 2020 00:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pear-generator/src/main/resources/vm/html/add.html.vm   | 2 +-
 .../pear-generator/src/main/resources/vm/html/edit.html.vm  | 2 +-
 .../pear-generator/src/main/resources/vm/html/list.html.vm  | 6 +++---
 .../src/main/resources/vm/java/controller.java.vm           | 6 ++++--
 .../src/main/resources/vm/java/domain.java.vm               | 4 ++--
 .../src/main/resources/vm/java/service.java.vm              | 4 ++--
 .../src/main/resources/vm/java/serviceImpl.java.vm          | 3 ++-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm
index b9d8b9d4..d611448f 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm
@@ -96,7 +96,7 @@
         let $ = layui.jquery;
         let laydate = layui.laydate;
 
-        let prefix = "/${moduleName}/${businessName}"
+        let prefix = "/${moduleName}/${businessName}/"
 
         #foreach($column in $columns)
             #set($field=$column.javaField)
diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm
index 59692b16..41f60f1a 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm
@@ -96,7 +96,7 @@
         let $ = layui.jquery;
         let laydate = layui.laydate;
 
-        let prefix = "/${moduleName}/${businessName}";
+        let prefix = "/${moduleName}/${businessName}/";
 
         #foreach($column in $columns)
             #if($column.edit && !$column.pk)
diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm
index 24b315e2..5c710681 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm
@@ -7,7 +7,7 @@
      <div class="layui-card">
         <div class="layui-card-body">
             <div class="col-sm-12 search-collapse">
-                <form id="formId">
+                <form id="formId" class="layui-form">
 #foreach($column in $columns)
 #if($column.query)
     #set($javaField=$column.javaField)
@@ -73,7 +73,7 @@
                  let form = layui.form;
                  let $ = layui.jquery;
 
-                 let prefix = "/${moduleName}/${businessName}";
+                 let prefix = "/${moduleName}/${businessName}/";
 
                  let cols = [
                      [
@@ -129,7 +129,7 @@
                  });
 
                  form.on('submit(${businessName}-query)', function (data) {
-                     window.refresh(data.field);
+                     table.reload('${businessName}-table', {where: data.field})
                      return false;
                  });
 
diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm
index 888a18fc..45b27372 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm
@@ -3,12 +3,14 @@ package ${packageName}.controller;
 import java.util.List;
 
 import com.github.pagehelper.PageInfo;
+import ${packageName}.domain.${ClassName};
 import com.pearadmin.common.tools.text.Convert;
 import com.pearadmin.common.web.base.BaseController;
 import com.pearadmin.common.web.domain.request.PageDomain;
 import com.pearadmin.common.web.domain.response.Result;
 import com.pearadmin.common.web.domain.response.ResultTable;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -42,9 +44,9 @@ public class ${ClassName}Controller extends BaseController
     @ResponseBody
     @GetMapping("/data")
     @PreAuthorize("hasPermission('/${moduleName}/${businessName}/data','${permissionPrefix}:data')")
-    public ResultTable list(${ClassName} ${className}, PageDomain pageDomain)
+    public ResultTable list(@ModelAttribute ${ClassName} ${className}, PageDomain pageDomain)
     {
-        PageInfo<${ClassName}> pageInfo = ${className}Service.select${ClassName}List(${className});
+        PageInfo<${ClassName}> pageInfo = ${className}Service.select${ClassName}Page(${className},pageDomain);
         return pageTable(pageInfo.getList(),pageInfo.getTotal());
     }
 
diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm
index 7447549b..ec1e8757 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm
@@ -7,9 +7,9 @@ import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 #if($table.crud || $table.sub)
-com.pearadmin.common.web.base.BaseDomain;
+import com.pearadmin.common.web.base.BaseDomain;
 #elseif($table.tree)
-com.pearadmin.common.web.base.TreeDomain;
+import com.pearadmin.common.web.base.TreeDomain;
 #end
 
 /**
diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm
index 8c6ba3ee..0ae8f467 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm
@@ -1,9 +1,9 @@
 package ${packageName}.service;
 
 import java.util.List;
-import
 import com.github.pagehelper.PageInfo;
-import com.pearadmin.common.web.domain.request.PageDomain; ${packageName}.domain.${ClassName};
+import com.pearadmin.common.web.domain.request.PageDomain;
+import ${packageName}.domain.${ClassName};
 
 /**
  * ${functionName}Service接口
diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 3e51ad3f..0c4ca4f9 100644
--- a/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -3,6 +3,7 @@ package ${packageName}.service.impl;
 import java.util.List;
 import java.util.ArrayList;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pearadmin.common.web.domain.request.PageDomain;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +50,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 查询${functionName}
-     * @param ${classsName} ${functionName}
+     * @param ${className} ${functionName}
      * @param pageDomain
      * @return ${functionName} 分页集合
      * */
-- 
Gitee