From 00be8452124d1cb0c611aa81c552297d1f0af32b Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 15 Apr 2024 11:09:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=9A=E6=9D=90=E6=96=99=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hyp/system/domain/dto/ApplyInfoListDTO.java     | 4 ++--
 .../main/resources/mapper/system/RewApplyInfoListMapper.xml  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListDTO.java b/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListDTO.java
index 74d8237..7fad5fc 100644
--- a/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListDTO.java
+++ b/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListDTO.java
@@ -34,8 +34,8 @@ public class ApplyInfoListDTO extends BaseEntity {
     /**
      * 申请状态（0：待提交 1：待审核，2，评分，3退回）
      */
-    @NotNull(message = "申请状态不能为空")
-    private Integer applyStatus;
+    @NotBlank(message = "申请状态不能为空")
+    private String applyStatus;
 
     /**
      * 创建者id
diff --git a/hyp-system/src/main/resources/mapper/system/RewApplyInfoListMapper.xml b/hyp-system/src/main/resources/mapper/system/RewApplyInfoListMapper.xml
index 8b9a6af..853e8fd 100644
--- a/hyp-system/src/main/resources/mapper/system/RewApplyInfoListMapper.xml
+++ b/hyp-system/src/main/resources/mapper/system/RewApplyInfoListMapper.xml
@@ -44,8 +44,9 @@
             <if test="createBy != null and createBy != ''">
                 and t.create_by like concat('%',#{createBy},'%')
             </if>
-            <if test="applyStatus != null">
-                and t.apply_status = #{applyStatus,jdbcType=INTEGER}
+            <if test="applyStatus != null and applyStatus != ''">
+                and apply_status in
+                <foreach item="item" index="index" collection="applyStatus.split(',')" open="(" separator="," close=")">'${item}'</foreach>
             </if>
         </trim>
         order by t.update_time desc