From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
index 3b541bc..39d46f0 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -93,7 +93,8 @@
String id=getUserId();
SysUser sysUser = sysUserService.getSysUser(id);
// 不是管理员时
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
this.approvalFlag=false;
}else {
this.approvalFlag=true;
@@ -242,6 +243,7 @@
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("操作失败。");
@@ -270,6 +272,7 @@
FacesUtils.info("已拒绝。");
RequestContext.getCurrentInstance().execute("PF('approvalDialog').hide()");
+ RequestContext.getCurrentInstance().update("approvalMngForm:approvalMngDataTable");
} catch (Exception e) {
logger.error("操作失败。", e);
FacesUtils.warn("操作失败。");
@@ -466,22 +469,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