From 1123d12eb51d23edcd4a39660ef8cd47802b931d Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 30 一月 2024 11:06:32 +0800
Subject: [PATCH] change config
---
src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
index 6f1f31e..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;
@@ -17,11 +18,9 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Controller
@Scope("session")
@@ -63,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) {
@@ -73,7 +77,7 @@
private void initUserSelectList() {
logger.info("WarehouseStockMngController initUserSelectList start");
- this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
+ this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
}
public void setUserSelectList(List<SysUser> userSelectList) {
this.userSelectList = userSelectList;
@@ -166,7 +170,7 @@
return;
}
- if (this.sysProject.getSysUserId() == null) {
+ if (StringUtils.isBlank(this.sysProject.getSysUserId())) {
FacesUtils.warn("请选择课题负责人。");
return;
}
@@ -238,6 +242,7 @@
if (count > 0) {
list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectId,projectName,sysUserName);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -246,17 +251,17 @@
@Override
public SysProject getRowData(String rowKey) {
- Iterator<SysProject> iterator = this.iterator();
- if (iterator != null) {
- SysProject br = null;
- while (iterator.hasNext()) {
- br = iterator.next();
- if (rowKey.equals(br.getId())) {
- return br;
- }
- }
- }
- return null;
+// Iterator<SysProject> iterator = this.iterator();
+// if (iterator != null) {
+// SysProject br = null;
+// while (iterator.hasNext()) {
+// br = iterator.next();
+// if (rowKey.equals(br.getId())) {
+// return br;
+// }
+// }
+// }
+ return sysProjectService.getSysProject(rowKey);
}
};
}
--
Gitblit v1.9.2