修改

lyh

6 天以前 6ff0f3e9cbb0b0f138fdabedeb23531d3cf06f1f

修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java

@@ -589,6 +589,7 @@
                    return Result.error(name + ": 设备标准已存在，不能重复添加");
                }
            }
            if (StrUtil.isNotEmpty(id)){
            if (eamMaintenanceStandardOld.getEquipmentId().equals(eamMaintenanceStandard.getEquipmentId())
                &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(eamMaintenanceStandard.getMaintenanceCategory())) {
                //升版操作，作废原有
@@ -602,6 +603,7 @@
                        int mainVersion = Integer.parseInt(matcher.group(1));
                        eamMaintenanceStandard.setStandardVersion("v" + (mainVersion + 1));
                    } catch (NumberFormatException ignored) {
                        }
                    }
                }
            }
@@ -1176,6 +1178,7 @@
                        }
                    }

                    if (StrUtil.isNotEmpty(id)){
                    if (eamMaintenanceStandardOld.getEquipmentId().equals(standard.getEquipmentId())
                            &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(standard.getMaintenanceCategory())) {
                        //升版操作，作废原有
@@ -1192,6 +1195,7 @@
                            }
                        }
                    }
                    }
                    standard.setStandardName(documentTitle);
                    eamMaintenanceStandardMapper.insert(standard);
                    standardId = standard.getId();