From 9f663904e2f914df171f15f3880ba39847dc065a Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 8 Aug 2023 13:50:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug:=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/xss/SQLFilter.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java b/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java
index 60584f33..eb6978d0 100644
--- a/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java
+++ b/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java
@@ -1,8 +1,14 @@
 package com.adc.da.xss;
 
 import com.adc.da.exception.AdcDaBaseException;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class SQLFilter {
 
 
@@ -13,13 +19,13 @@ public class SQLFilter {
             String checkStr= str;
             checkStr = StringUtils.replace(checkStr, "\\", "");
             checkStr = checkStr.toLowerCase();
-            String[] keywords = new String[]{"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"};
+            String[] keywords = new String[]{"master ", "truncate ", "insert ", "select ", "delete ", "update", "declare ", "alter ", "drop "};
             String[] arr$ = keywords;
             int len$ = keywords.length;
 
             for(int i$ = 0; i$ < len$; ++i$) {
                 String keyword = arr$[i$];
-                if (checkStr.indexOf(keyword) != -1) {
+                if (checkStr.contains(keyword)) {
                     throw new AdcDaBaseException("包含非法字符");
                 }
             }

From 8b25043d73c60627fbcd799245dc4d7805280044 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 9 Aug 2023 16:17:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug:=E4=BC=81=E6=A0=87=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/workFlow/service/ActSarItemsBussEOService.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
index dcd7a327..2d34ca5c 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
@@ -554,6 +554,15 @@ public class ActSarItemsBussEOService {
                     }
                 }
             }
+            // 更新企标计划状态
+            String esPlanId = (String) standMap.get("planId");
+            if (StringUtils.isNotBlank(esPlanId)) {
+                EsRevisePlan esRevisePlan = esRevisePlanDao.selectById(esPlanId);
+                esRevisePlan.setPlanStatus("4");
+                esRevisePlan.setStandId(sarBussionessStand.getId());
+                esRevisePlan.setActualTime(new Date());
+                esRevisePlanDao.updateById(esRevisePlan);
+            }
         }
 
         return bussId;