From cf6b965a86065a537a40c74f67e88a04447d2582 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 12 七月 2021 18:00:38 +0800
Subject: [PATCH] 修改导入申购
---
src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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..f6897d0 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java
@@ -17,10 +17,7 @@
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;
@Controller
@@ -73,7 +70,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;
@@ -238,6 +235,7 @@
if (count > 0) {
list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectId,projectName,sysUserName);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -246,17 +244,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