diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java index b08422e..96a06a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java @@ -94,8 +94,8 @@ moduleTemplatePrintConfig.setSigns(dtoToJson(request.getSignImageResponseList())); AuthUser authUser = ShiroKit.getUser(); moduleTemplatePrintConfig.setUpdateUser(authUser.getId()); - updateFlag &= this.baseMapper.updateById(moduleTemplatePrintConfig) > 0; populateTableId(request.getModuleFieldConfigList(), moduleTemplatePrintConfig); + updateFlag &= this.baseMapper.updateById(moduleTemplatePrintConfig) > 0; if (updateFlag) { return ReturnUtil.success(); } @@ -135,6 +135,9 @@ } private String dtoToJson(List signImageResponses) { + if (CollectionUtil.isEmpty(signImageResponses)) { + return null; + } List> signMapList = new ArrayList<>(); for (SignImageResponse signImageResponse : signImageResponses) { Map signMap = new HashMap<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java index b08422e..96a06a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java @@ -94,8 +94,8 @@ moduleTemplatePrintConfig.setSigns(dtoToJson(request.getSignImageResponseList())); AuthUser authUser = ShiroKit.getUser(); moduleTemplatePrintConfig.setUpdateUser(authUser.getId()); - updateFlag &= this.baseMapper.updateById(moduleTemplatePrintConfig) > 0; populateTableId(request.getModuleFieldConfigList(), moduleTemplatePrintConfig); + updateFlag &= this.baseMapper.updateById(moduleTemplatePrintConfig) > 0; if (updateFlag) { return ReturnUtil.success(); } @@ -135,6 +135,9 @@ } private String dtoToJson(List signImageResponses) { + if (CollectionUtil.isEmpty(signImageResponses)) { + return null; + } List> signMapList = new ArrayList<>(); for (SignImageResponse signImageResponse : signImageResponses) { Map signMap = new HashMap<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java index 72125d6..7ab2530 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java @@ -36,7 +36,7 @@ Assert.isFalse(ObjectUtils.isEmpty(moduleTemplatePrintConfig.getTemplateFileId()), () -> { throw new BusinessException(BusinessExceptionEnum.TEMPLATE_FILE_NULL); }); - + moduleIdValue = ObjectUtils.isEmpty(moduleIdValue) ? (Long) customParam.get("id") : moduleIdValue; //根据打印模板配置,初始化文件打印注册信息 FilePrintRegister filePrintRegister = initialization(templateFileDir, moduleIdValue, moduleTemplatePrintConfig); if (customParam != null) {