From 8a61c69ea5794cdf7aa4cc9ff30b9365cea0fb78 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Mar 2023 22:40:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8api=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=BB=A7=E6=89=BFBaseGridRequest=E9=81=BF?=
 =?UTF-8?q?=E5=85=8Dsql=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/controller/sys/request/MsgRequest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
index 3e5ac7f497..a06787bd9e 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
@@ -1,15 +1,15 @@
 package io.dataease.controller.sys.request;
 
+import io.dataease.controller.sys.base.BaseGridRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 @Data
 @ApiModel("消息条件")
-public class MsgRequest implements Serializable {
+public class MsgRequest extends BaseGridRequest implements Serializable {
 
     private static final long serialVersionUID = 1920091635946508658L;
 
@@ -19,6 +19,4 @@ public class MsgRequest implements Serializable {
     @ApiModelProperty("是否订阅")
     private Boolean status;
 
-    @ApiModelProperty("排序描述")
-    private List<String> orders;
 }

From 91a3c8a8233acf9438ef8419b9021320eb166dd2 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Mar 2023 22:58:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E9=9D=9E=E6=B3=95=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java b/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java
index 56f92e2633..add12ab202 100644
--- a/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java
+++ b/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java
@@ -46,7 +46,7 @@ public class SqlInjectAop {
             String[] value = annotation.value();
             boolean illegal = isIllegal(value, request.getOrders());
             if (illegal) {
-                DEException.throwException("Illegal order exp");
+                DEException.throwException("Illegal sort exp");
             }
             return point.proceed(args);
         } catch (Throwable e) {