From e2fff404d509d32bac6a65e05285ce9522a237b2 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 5 Dec 2023 22:42:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java    | 2 +-
 .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml        | 4 ++++
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml    | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
index 65b1a5c4..d5cf916a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
@@ -53,7 +53,7 @@ public class StandSystemDTO {
     private String standName;
 
     @ApiModelProperty(value = "标准状态")
-    @Excel(name = "文本状态", width = 25, orderNum = "4")
+    @Excel(name = "标准状态", width = 25, orderNum = "4")
     private String standState;
 
     @ApiModelProperty(value = "文本状态")
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index 7e4d87c4..3dcaf149 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -255,6 +255,10 @@
             AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%')
         </if>
         <!--搜索条件数据来源-->
+        <if test="param.standState != null and param.standState != ''">
+            AND gb.TEXT_STATUS = #{param.standState}
+        </if>
+        <!--搜索条件数据来源-->
         <if test="param.dataSource != null and param.dataSource != ''">
             AND gb.STAND_TYPE = #{param.dataSource}
         </if>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index fbbc6ef0..d45e8bca 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -1340,6 +1340,10 @@
             <if test="param.draftUserName != null and param.draftUserName != ''">
                 AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%')
             </if>
+            <!--标准状态-->
+            <if test="param.standState != null and param.standState != ''">
+                AND es.TEXT_STATUS_BUSS = #{param.standState}
+            </if>
             <!--数据来源-->
             <if test="param.dataSource != null and param.dataSource != ''">
                 AND 'ENTERPRISE' = #{param.dataSource}