From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug
---
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
index 9144e5d..ae89ec6 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -229,7 +229,6 @@
applyIds.add(opeApply.getId());
}*/
- System.out.println("管制品========="+opeApply.getReagent().getControlProducts());
String baseMetaValue = baseMetaService.getBaseMetaValue(opeApply.getReagent().getControlProducts());
if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
adminApplyIds.add(opeApply.getId());
@@ -238,11 +237,10 @@
applyIds.add(opeApply.getId());
}
}
- System.out.println("adminApplyIds=========="+adminApplyIds);
- System.out.println(applyIds);
boolean result = this.opeApplyService.updateSelectedOpeApplyStatus(memo, applyIds, adminApproveUserId, adminApplyIds,firstUserIds);
FacesUtils.info("已批准。");
RequestContext.getCurrentInstance().execute("PF('approvalDialog').hide()");
+ RequestContext.getCurrentInstance().update("approvalMngForm:approvalMngDataTable");
} catch (Exception e) {
logger.error("操作失败。", e);
FacesUtils.warn("操作失败。");
@@ -271,6 +269,7 @@
FacesUtils.info("已拒绝。");
RequestContext.getCurrentInstance().execute("PF('approvalDialog').hide()");
+ RequestContext.getCurrentInstance().update("approvalMngForm:approvalMngDataTable");
} catch (Exception e) {
logger.error("操作失败。", e);
FacesUtils.warn("操作失败。");
@@ -467,22 +466,23 @@
/*} catch (Exception e) {
logger.error(e);
}*/
+ selectedList = null;
return list;
}
@Override
public OpeApply getRowData(String rowKey) {
- Iterator<OpeApply> iterator = this.iterator();
- if (iterator != null) {
- OpeApply oa = null;
- while (iterator.hasNext()) {
- oa = iterator.next();
- if (rowKey.equals(oa.getId())) {
- return oa;
- }
- }
- }
- return null;
+// Iterator<OpeApply> iterator = this.iterator();
+// if (iterator != null) {
+// OpeApply oa = null;
+// while (iterator.hasNext()) {
+// oa = iterator.next();
+// if (rowKey.equals(oa.getId())) {
+// return oa;
+// }
+// }
+// }
+ return opeApplyService.getOpeApply(rowKey);
}
};
}
--
Gitblit v1.9.2