姑苏实验室去除价格确认过程

kongzy

2023-10-23 1eeae82f74cbb3469ad8931e45b6fc77a945b912

 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;
                }
            }*/
            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) && !"15fc90a1f7bf43bda01313904b543195".equals(this.getUser().getRoleId())) {
                    if (StringUtils.isNotBlank(baseMetaValue) &&StringUtils.isBlank(opeApply.getBeforeApproveUserId())) {
                    dangerousFlag = true;
                }
            }
            }


        }

        this.memo = null;
@@ -230,7 +239,8 @@
                }*/

                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 {