From f6e7379fbfbba4f6667944a2be62f99461bf97f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 六月 2024 16:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index 1a649df..d0c1aa7 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -42,6 +42,7 @@
<if test="insItems != ''">
and inspection_item_subclass = #{insItems}
</if>
+ group by spl.id
order by p.id
</select>
<select id="getOne" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -77,7 +78,7 @@
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
- and tree=#{tree}
+ and tree like #{tree}
order by case when man_hour_group is NULL then 1
when man_hour_group ='' then 1 else 0 end,
CASE
--
Gitblit v1.9.3