From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 26 十月 2021 17:05:35 +0800
Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的
---
src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
index 86b00ef..e5c2a21 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
@@ -1,5 +1,6 @@
package com.nanometer.smartlab.controller;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -170,6 +171,7 @@
if (count > 0) {
list = sysWarehouseService.getSysWarehouseList(type, name, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -178,17 +180,17 @@
@Override
public SysWarehouse getRowData(String rowKey) {
- Iterator<SysWarehouse> iterator = this.iterator();
- if (iterator != null) {
- SysWarehouse su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysWarehouse> iterator = this.iterator();
+// if (iterator != null) {
+// SysWarehouse su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysWarehouseService.getSysWarehouse(rowKey);
}
};
}
--
Gitblit v1.9.2