From af607e09de61badbaef57bc0d38002e48a44ac4c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:48:50 +0800
Subject: [PATCH] 订单领取申领人被删除报错

---
 src/main/java/com/nanometer/smartlab/api/ApiAction.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 73989a6..6021835 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -426,7 +426,7 @@
         return retJSON.toJSONString();
     }
 
-    // 报警情况接口(warning)
+    // 报警情况接口(warning)  货柜预警接口
     @ResponseBody
     @RequestMapping(value = "/alarm")
     public String alarm(HttpServletRequest request) throws IOException {
@@ -618,7 +618,8 @@
             					(String[])wareContainerCodeList.toArray(new String[0])));
 
             }
-            if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()){
+            if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()
+            || user.getSeeFlag().ordinal() == SeeFlag.LEADING.ordinal()){
                 map.put("containerCodeList", containerCodeList);
             }
         }

--
Gitblit v1.9.2