From b805858ea0341e13f6213c3a9b01da6a13d22f83 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 10 十二月 2020 10:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index ed391d0..1f61365 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -63,6 +63,10 @@
if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
params.put("applyUserId", applyUserId);
}
+
+ if("连悦".equals(sysUser.getName())){
+ params.remove("applyUserId");
+ }
}
params.put("approveUserId", approveUserId);
@@ -177,6 +181,10 @@
if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
params.put("applyUserId", applyUserId);
}
+
+ if("连悦".equals(sysUser.getName())){
+ params.remove("applyUserId");
+ }
}
params.put("approveUserId", approveUserId);
--
Gitblit v1.9.2