From 69f11b34307678ae29e35646eb57883bfe5ce984 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期二, 30 五月 2023 20:42:13 +0800
Subject: [PATCH] 扦样化验优化1-新增扦样信息

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
index dc26b86..7f9ade9 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
@@ -76,7 +76,7 @@
      * @return 杞︾墝璁惧閰嶇疆锛屾病鏈夊垯杩斿洖NULL
      */
     public InoutConf getInoutConf(List<InoutConf> listInoutConf, String sort, String type, String inoutProgress, int inOrder) {
-        if (null == listInoutConf) return null;
+        if (null == listInoutConf) return new InoutConf(sort);
         if (StringUtils.isEmpty(sort)) sort = "1";
 
         InoutConf result = null;
@@ -89,7 +89,7 @@
             }
         }
 
-        if (null == result) return null;
+        if (null == result) return new InoutConf(sort);
 
         return result;
     }

--
Gitblit v1.9.3