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

@@ -560,6 +560,10 @@
            EamMaintenanceStandard eamMaintenanceStandard = extractDeviceInfo(sheet);
            if (eamMaintenanceStandard == null) {
                return Result.error("设备信息提取失败");
            }else {
                if (eamMaintenanceStandard.getEquipmentId() == null) {
                    return Result.error("设备信息提取失败");
                }
            }

            eamMaintenanceStandard.setStandardName(name);
@@ -646,6 +650,7 @@

        EamMaintenanceStandard standard = new EamMaintenanceStandard();
        standard.setEquipmentName(extractField(headerText, "设备名称[:：]\\s*(\\S+)"));
        standard.setEquipmentCode(extractField(headerText, "统一编号[:：]\\s*(\\S+)"));


        // 日期处理

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -458,8 +458,8 @@
        }
    }

    @AutoLog(value = "用户表-查询指定用户和维修部门关联的数据")
    @ApiOperation(value = "用户表-查询指定用户和维修部门关联的数据", notes = "用户表-查询指定用户和维修部门关联的数据")
    @AutoLog(value = "用户表-查询指定用户和EAM中心关联的数据")
    @ApiOperation(value = "用户表-查询指定用户和EAM中心关联的数据", notes = "用户表-查询指定用户和EAM中心关联的数据")
    @GetMapping(value = "/userBaseFactoryList")
    public Result<List<EamBaseFactoryIdModel>> userBaseFactoryList(@RequestParam(name = "userId", required = true) String userId) {
        Result<List<EamBaseFactoryIdModel>> result = new Result<>();