From 30ef534fcffe0520bebe7a34abe69d7afbbf227f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 13:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..9af977a 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,14 +16,16 @@
         qu.deal_result,
         qu.deal_name,
         qu.deal_time,
+
         CASE
-        WHEN qu.model = pm.id THEN pm.model
+        WHEN qu.model REGEXP '^[0-9]+$' AND qu.model = pm.id THEN pm.model
         ELSE qu.model
         END AS model,
         CASE
-        WHEN qu.model = pm.id THEN true
+        WHEN qu.model REGEXP '^[0-9]+$' AND qu.model = pm.id THEN true
         ELSE false
         END AS method
+
         FROM quality_unqualified qu
         LEFT JOIN product_model pm ON qu.model = pm.id
         where

--
Gitblit v1.9.3