From 6af8995b319a569586c90e1d29ab0b6504179073 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 19 六月 2024 00:50:02 +0800
Subject: [PATCH] bug修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 1 -
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 3 +++
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 3 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 4 +++-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 3aa1132..878388a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -546,7 +546,6 @@
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
delRSet.add("0");
- delRSet.add("1");
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
if (Integer.parseInt(jo1.get("c") + "") > 9) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
index 05993d7..04ce217 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
@@ -47,7 +47,9 @@
@Override
public int upStandardTemplate(StandardTemplate standardTemplate) {
- standardTemplate.setThing(standardTemplateMapper.selectById(standardTemplate.getId()).getThing());
+ if(standardTemplate.getThing().equals("")){
+ standardTemplate.setThing(null);
+ }
return standardTemplateMapper.updateById(standardTemplate);
}
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index a696171..e4eba45 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -53,6 +53,9 @@
<if test="inspectionItemSubclass!=null">
and inspection_item_subclass = #{inspectionItemSubclass}
</if>
+ <if test="inspectionItemSubclass == null">
+ and (inspection_item_subclass is null or inspection_item_subclass = '')
+ </if>
<if test="model!=null">
and model = #{model}
</if>
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index b0072ed..24cbfbb 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -270,5 +270,8 @@
<if test="itemChild != null and itemChild != ''">
and inspection_item_subclass = #{itemChild}
</if>
+ <if test="itemChild == null or itemChild == ''">
+ and (inspection_item_subclass is null or inspection_item_subclass = '')
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3