From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 57e71cf..4aaf691 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1817,7 +1817,7 @@
List<OpeApplyReserve> list = null;
SysUser loginUser = getUser();
String id="";
- if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
+ if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() ==SeeFlag.LEADING){
}else {
//userName=loginUser.getName();
@@ -1925,7 +1925,7 @@
//map=null;
SysUser loginUser = getUser();
String id="";
- if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
+ if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() == SeeFlag.LEADING){
}else {
//userName=loginUser.getName();
--
Gitblit v1.9.2