From dd43f10cba754d4a7b371b9bf39db262b94d3c10 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 七月 2024 15:43:59 +0800
Subject: [PATCH] 数采报错修复

---
 cnas-server/src/main/resources/mapper/DeviceMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 40bcc1f..60660a3 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -119,7 +119,8 @@
     </select>
 
     <select id="getInspectionItemSubclass" resultType="java.lang.String">
-        SELECT ip.inspection_item_subclass FROM ins_product ip
+        SELECT if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
+                  ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass FROM ins_product ip
         where ip.ins_sample_id = #{id}
     </select>
 </mapper>

--
Gitblit v1.9.3