From b6576a4db959d2551e343a8bb0045aa67387aacc Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 28 二月 2022 13:12:44 +0800
Subject: [PATCH] 库房状态管理

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

diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index dd9d421..e82e8a7 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -120,7 +120,8 @@
         if (StringUtils.isNotBlank(createrUser)) {
             SysUser sysUser = sysUserService.getSysUser(createrUser);
             // 不是管理员时,加入applyUserId
-            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                    && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                 params.put("createrUser", createrUser);
             }
         }
@@ -144,7 +145,8 @@
         if (StringUtils.isNotBlank(createrUser)) {
             SysUser sysUser = sysUserService.getSysUser(createrUser);
             // 不是管理员时,加入applyUserId
-            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                    && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                 params.put("createrUser", createrUser);
             }
         }
@@ -213,6 +215,10 @@
                 valuesList.add(cellInfo);
             }
 
+            if (valuesList.size() != 4){
+                break;
+            }
+
             if (userMap.get(valuesList.get(2)) == null) {
                 throw new Exception("课题负责人不存在");
             }

--
Gitblit v1.9.2