From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 26 十月 2021 17:05:35 +0800
Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
index 73a3fd7..69b6471 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
@@ -335,7 +335,8 @@
 
 			// 不是管理员时,加入userid
 			//if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()||sysUser.getSeeFlag().getKey() == SeeFlag.LEADING.getKey()) {
-			if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()) {
+			if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()
+					&& sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
 
 			} else {
 				params.put("userId", userId);
@@ -1129,5 +1130,12 @@
 		ExcelUtils.export2Excel(list,"实验室库存",map);
 	}
 
+    @Override
+    public OpeReagentStatus getStatus(String reagentId, String reagentCode) {
+
+
+		return opeReagentStatusDao.getStatus(reagentId,reagentCode);
+    }
+
 
 }

--
Gitblit v1.9.2