From 585e878b169bdeb2bc8cc452b9d2e640d00caa6d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 04 七月 2023 09:00:35 +0800
Subject: [PATCH] 质检报告

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 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 da03cd4..23e56bf 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
@@ -4,13 +4,11 @@
 import com.ld.igds.inout.InoutConstant;
 import com.ld.igds.inout.dto.InoutData;
 import com.ld.igds.inout.service.InoutService;
-import com.ld.igds.io.dto.WeightDto;
 import com.ld.igds.m.service.InoutCommonService;
 import com.ld.igds.models.DicTrigger;
 import com.ld.igds.models.InoutConf;
 import com.ld.igds.models.InoutSysConf;
 import com.ld.igds.sys.service.DicTriggerService;
-import com.ld.igds.util.ContextUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -110,16 +108,12 @@
         if (null == listInoutConf) return new InoutConf(sort);
         if (StringUtils.isEmpty(sort)) sort = "1";
 
-        InoutConf result = null;
         for (InoutConf conf : listInoutConf) {
             if (sort.equals(conf.getSort()) && type.equals(conf.getType())) {
                 return conf;
             }
         }
-
-        if (null == result) return new InoutConf(sort);
-
-        return result;
+        return new InoutConf(sort);
     }
 
 
@@ -159,10 +153,10 @@
      *
      * @param deptId
      */
-    public void initInoutScreen(String deptId) {
-        if (StringUtils.isEmpty(deptId))
-            deptId = ContextUtil.subDeptId(null);
-        inoutService.initInoutScreen(deptId);
+    public void initInoutScreen(String companyId, String deptId) {
+        if (StringUtils.isEmpty(companyId)) return;
+        if (StringUtils.isEmpty(deptId)) return;
+        inoutService.notifyToScreen(companyId, deptId, null);
     }
 
     public List<InoutData> getListInoutCache(String deptId) {

--
Gitblit v1.9.3