wenhongquan 2 жил өмнө
parent
commit
e7391eaa0b

+ 8 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblFacilitiesController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.ServletUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,6 +57,12 @@ public class TblFacilitiesController extends BaseController
     @PostMapping("/list")
     public TableDataInfo list1(@RequestBody(required = false) TblFacilities tblFacilities1)
     {
+
+        if(tblFacilities1.getParams()!=null && tblFacilities1.getParams().get("pageSize")!=null){
+            ServletUtils.getRequest().setAttribute("pageSize",tblFacilities1.getParams().get("pageSize"));
+            ServletUtils.getRequest().setAttribute("pageNum",tblFacilities1.getParams().get("pageNum"));
+        }
+
         startPage();
         List<TblFacilities> list = null;
 

+ 2 - 2
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源

+ 3 - 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -21,6 +21,9 @@ public class ServletUtils
      */
     public static String getParameter(String name)
     {
+        if(getRequest().getAttribute(name)!=null){
+            return getRequest().getAttribute(name).toString();
+        }
         return getRequest().getParameter(name);
     }