From 5d06180456819a8d3c5a092597c1f466562f1cd4 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 22 Sep 2021 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 92ab7b4..c041ebf 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1009,7 +1009,7 @@
}else{
sysUser = sysUserDao.getSysUser(userID);
// 如果是管理员也可以开柜
- if(sysUser.getSeeFlag() == SeeFlag.MANAGE){
+ if(sysUser.getSeeFlag() == SeeFlag.MANAGE||sysUser.getSeeFlag() == SeeFlag.LEADING){
return "1";
} else {
// 不可以打开柜子
@@ -1254,7 +1254,8 @@
logger.error("The containerCode has not been exists!");
continue;
}
- } else if (status.equals(2)){
+ }
+ else if (status.equals(2)){
/*SysWarehouseContainer container = sysWarehouseContainerDao
.getSysWarehouseContainerByContainerCode(containerCode);
if (Objects.isNull(container) == false) {
@@ -1278,8 +1279,10 @@
if (status.equals(-1)){
continue;
}
- opeReagentStatusDao.syncOpeReagentStatus(params);
-
+ int i = opeReagentStatusDao.syncOpeReagentStatus(params);
+ if (i < 1){
+ opeReagentStatusDao.syncOpeReagentStatus(params);
+ }
}
}
--
Gitblit v1.9.2