Merge remote-tracking branch 'origin/master'

zhangherong

8 天以前 2d3ded65b3c30b4f5cba6080d9c28e16a0b296cc

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

@@ -594,9 +594,11 @@

            // 触发保养流程
            SysParams sysParams = sysParamsService.getSysPramBySettingKey("maintenance_import_type");
            if (sysParams != null && sysParams.getSettingValue().equals("1")) {
            if (sysParams != null) {
                if (sysParams.getSettingValue().equals("1")){
                eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
                eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
                }
            } else {
                return Result.error("未找到保养流程导入相关配置,请联系管理员");
            }