From f27eb8157db0d6ec5f44b6e6fc4d1469d4f8e8bf Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 4 Jul 2020 11:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=AD=97=E7=AC=A6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=B0=8F=E6=95=B0=E7=82=B9&=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=BC=82=E5=B8=B8=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/core/page/PageDomain.java   | 3 +++
 .../src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java  | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
index 7fccaf46..e6dd98e2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@@ -11,10 +11,13 @@ public class PageDomain
 {
     /** 当前记录起始索引 */
     private Integer pageNum;
+
     /** 每页显示记录数 */
     private Integer pageSize;
+
     /** 排序列 */
     private String orderByColumn;
+
     /** 排序的方向 "desc" 或者 "asc". */
     private String isAsc;
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
index b31804b6..1c4c1713 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.utils.sql;
 
+import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -10,9 +11,9 @@ import com.ruoyi.common.utils.StringUtils;
 public class SqlUtil
 {
     /**
-     * 仅支持字母、数字、下划线、空格、逗号（支持多个字段排序）
+     * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
      */
-    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+";
+    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
 
     /**
      * 检查字符，防止注入绕过
@@ -21,7 +22,7 @@ public class SqlUtil
     {
         if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
         {
-            return StringUtils.EMPTY;
+            throw new BaseException("参数不符合规范，不能进行查询");
         }
         return value;
     }