From 5b8eb8aa93e9f03c6667f030331a107327299221 Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Thu, 9 Jul 2026 14:54:56 +0800
Subject: [PATCH] bug fix

---
 .../QualFilingMaterialChangeUpdateCmd.java    |  4 --
 .../mapper/QualFilingChangeMapper.xml         | 46 ++++++++++---------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java
index 60b0762..819b9bd 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java
@@ -23,19 +23,16 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable {
      * 备案变更id
      */
     @ApiModelProperty(value = "备案变更id", required = true)
-    @NotNull(message = "备案变更id不能为空")
     private Long filingChangeId;
     /**
      * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度
      */
     @ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度", required = true)
-    @NotBlank(message = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度不能为空")
     private Integer materialType;
     /**
      * 材料内容
      */
     @ApiModelProperty(value = "材料内容", required = true)
-    @NotBlank(message = "材料内容不能为空")
     private String materialContent;
     /**
      * 材料格式
@@ -87,7 +84,6 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable {
      */
     @ApiModelProperty(value = "环境")
     private String env;
-    @NotNull(message = "version不能为空")
     @ApiModelProperty(value = "version")
     private Integer version;
 }
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
index 4d87d62..ae85532 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
@@ -90,29 +90,31 @@
     <!-- 机构端分页查询：每个filing_id只取最新一条变更记录，直接返回CO -->
     <select id="orgPage" resultMap="OrgCOResultMap">
         SELECT * FROM (
-            SELECT
-                ROW_NUMBER() OVER (PARTITION BY qfc.filing_id ORDER BY qfc.id DESC) AS rn,
-                qfc.*
-            FROM qual_filing_change qfc
-            <where>
-                qfc.delete_enum = 'false'
-                AND qfc.org_id = #{query.orgId}
-                <if test="query.filingNo != null and query.filingNo != ''">
-                    AND qfc.id = #{query.filingNo}
-                </if>
-                <if test="query.filingUnitName != null and query.filingUnitName != ''">
-                    AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
-                </if>
-                <if test="query.filingTerritoryCode != null and query.filingTerritoryCode != ''">
-                    AND (qfc.filing_territory_code = #{query.filingTerritoryCode}
-                        OR qfc.filing_territory_name = #{query.filingTerritoryCode})
-                </if>
-                <if test="query.filingStatusCode != null">
-                    AND qfc.filing_status_code = #{query.filingStatusCode}
-                </if>
-            </where>
+        SELECT
+        ROW_NUMBER() OVER (PARTITION BY qfc.filing_id ORDER BY qfc.id DESC) AS rn,
+        qfc.*
+        FROM qual_filing_change qfc
+        <where>
+            qfc.delete_enum = 'false'
+            AND qfc.org_id = #{query.orgId}
+        </where>
         ) temp
-        WHERE temp.rn = 1
+        <where>
+            temp.rn = 1
+            <if test="query.filingNo != null and query.filingNo != ''">
+                AND temp.id = #{query.filingNo}
+            </if>
+            <if test="query.filingUnitName != null and query.filingUnitName != ''">
+                AND temp.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
+            </if>
+            <if test="query.filingTerritoryCode != null and query.filingTerritoryCode != ''">
+                AND (temp.filing_territory_code = #{query.filingTerritoryCode}
+                OR temp.filing_territory_name = #{query.filingTerritoryCode})
+            </if>
+            <if test="query.filingStatusCode != null">
+                AND temp.filing_status_code = #{query.filingStatusCode}
+            </if>
+        </where>
     </select>
 
     <!-- 按filing_id批量统计变更次数 -->