“linengliang”
2023-12-21 411d79af7b1b755535fa9a9ee6ed94f682fca09a
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -264,14 +264,14 @@
                FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
                if(ObjectUtils.isNotNull(faultInfo)){
                    String isConfirm2 = faultInfo.getIsConfirm();
                    if(!isConfirm1.equals("yes")||isConfirm2.equals("yes")){
                        return Result.error("验收失败,产品质量隐患确认和事故登记尚未完场,请完成确认后再进行验收");
                    if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
                        return Result.error("验收失败,产品质量隐患确认和事故登记尚未完成,请完成确认后再进行验收");
                    }
                }else {
                    return Result.error("验收失败,未生成事故登记单");
                }
            }else {
                return Result.error("验收失败,未生成产平质量确认");
                return Result.error("验收失败,未生成产品质量确认");
            }
        }
        LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();