From b7735518ee19f52e6fbc5ae5f047f916ec5bddee Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 18 六月 2021 17:10:57 +0800
Subject: [PATCH] 修改按钮权限、删除实验室时同时删除存储柜、添加存储柜时条码你不能重复

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 88d24c1..4da1d67 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -71,7 +71,8 @@
             if (StringUtils.isNotBlank(applyUserId)) {
     			SysUser sysUser = sysUserService.getSysUser(applyUserId);
     			// 不是管理员时,加入applyUserId
-    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
     				 params.put("applyUserId", applyUserId);
     			}
 
@@ -112,7 +113,8 @@
             if (StringUtils.isNotBlank(approveUserId)) {
                 SysUser sysUser = sysUserService.getSysUser(approveUserId);
                 // 不是管理员时,加入applyUserId
-                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("approveUserId", approveUserId);
                 }
             }
@@ -151,7 +153,8 @@
             if (StringUtils.isNotBlank(approveUserId)) {
                 SysUser sysUser = sysUserService.getSysUser(approveUserId);
                 // 不是管理员时,加入applyUserId
-                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("approveUserId", approveUserId);
                 }
             }
@@ -189,7 +192,8 @@
     		if (StringUtils.isNotBlank(applyUserId)) {
     			SysUser sysUser = sysUserService.getSysUser(applyUserId);
     			// 不是管理员时,加入applyUserId
-    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
     				 params.put("applyUserId", applyUserId);
     			}
 

--
Gitblit v1.9.2