From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug

---
 src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
index f6897d0..c3fc2b5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
@@ -6,6 +6,7 @@
 import com.nanometer.smartlab.service.*;
 import com.nanometer.smartlab.util.Constants;
 import com.nanometer.smartlab.util.FacesUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.shiro.subject.Subject;
 import org.primefaces.context.RequestContext;
@@ -19,6 +20,7 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Controller
 @Scope("session")
@@ -60,7 +62,12 @@
 
     public SysUser getSelectedUserById(String userId) {
         System.out.println(userId);
-        return userSelectList.stream().filter(u->u.getId().equals(userId)).findFirst().get();
+       List<SysUser> userList= userSelectList.stream().filter(u -> u.getId().equals(userId)).collect(Collectors.toList());
+       if(userList.size()>0){
+            return userList.get(0);
+       }else{
+           return new SysUser();
+       }
     }
 
     public List<SysUser> getUserSelectList(String keyword) {
@@ -163,7 +170,7 @@
                     return;
                 }
 
-                if (this.sysProject.getSysUserId() == null) {
+                if (StringUtils.isBlank(this.sysProject.getSysUserId())) {
                     FacesUtils.warn("请选择课题负责人。");
                     return;
                 }

--
Gitblit v1.9.2