From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
index 39d46f0..4391eb5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -176,7 +176,7 @@
return;
}
- this.dangerousFlag = false;
+ this.dangerousFlag = false;//二级审批标志
this.adminApproveUserId = null;
for (OpeApply opeApply : this.selectedList) {
if (!this.opeApplyService.isApplyPendingApproval(opeApply)) {
@@ -189,13 +189,22 @@
dangerousFlag = true;
}
}*/
- String controlProducts = opeApply.getReagent().getControlProducts();
- if (StringUtils.isNotBlank(controlProducts)) {
- String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
- if (StringUtils.isNotBlank(baseMetaValue) && !"15fc90a1f7bf43bda01313904b543195".equals(this.getUser().getRoleId())) {
+ if(getActiveEnv().equalsIgnoreCase("gslab")){//姑苏实验室打开二级审批
+ if(StringUtils.isBlank(opeApply.getBeforeApproveUserId())){
dangerousFlag = true;
}
+
+ }else{//其他情形：管制品打开二级审批
+ String controlProducts = opeApply.getReagent().getControlProducts();
+ if (StringUtils.isNotBlank(controlProducts)) {
+ String baseMetaValue = baseMetaService.getBaseMetaValue(controlProducts);
+ if (StringUtils.isNotBlank(baseMetaValue) &&StringUtils.isBlank(opeApply.getBeforeApproveUserId())) {
+ dangerousFlag = true;
+ }
+ }
}
+
+
}
this.memo = null;
@@ -229,17 +238,15 @@
applyIds.add(opeApply.getId());
}*/
- System.out.println("管制品========="+opeApply.getReagent().getControlProducts());
String baseMetaValue = baseMetaService.getBaseMetaValue(opeApply.getReagent().getControlProducts());
- if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
+ //if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
+ if (this.dangerousFlag&& StringUtils.isBlank(opeApply.getBeforeApproveUserId())) {
adminApplyIds.add(opeApply.getId());
firstUserIds.add(opeApply.getApproveUserId());
} else {
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()");
--
Gitblit v1.9.2