From b434c283d2a4787b6eb840a0289d6adc62fba132 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 14 五月 2024 15:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 4c9c61f..721b82c 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -30,12 +30,7 @@
from standard_method
where is_use = 1
and is_product = 1
- and (
- structure_test_object_id is null
- OR structure_test_object_id = ''
- OR structure_test_object_id = '[]'
- or structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
- )
+ and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
</select>
<select id="selectParameterList" resultType="standardProductList">
select inspection_item,
@@ -80,16 +75,22 @@
from standard_method
where is_use = 1
and is_product = 1
- and (
- structure_test_object_id is null
- OR structure_test_object_id = ''
- OR structure_test_object_id = '[]'
- or structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
- )
+ and structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
</select>
<select id="selectListEnum" resultType="com.yuanchu.mom.pojo.StandardMethodList">
select id,code,name from standard_method
where is_product = 1
and is_use = 1
</select>
+ <select id="selectStandardMethodListsByNull" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+ select id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and (
+ structure_test_object_id is null
+ OR structure_test_object_id = ''
+ OR structure_test_object_id = '[]'
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3