From e9ae27404803d0616e06ed21027408a71b4bc19c Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期三, 05 三月 2025 17:34:02 +0800 Subject: [PATCH] 集成申码接口调整:当码值按照约定传表名为空的业务场景下传null校验问题和码值组装问题。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java index 2543ef7..db4c4ef 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java @@ -16,8 +16,12 @@ */ package com.vci.ubcs.code.wrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.vci.ubcs.code.entity.CodeClassifyTemplateButton; +import com.vci.ubcs.code.enumpack.CodeButtonUseEnum; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO; +import com.vci.ubcs.omd.cache.EnumCache; +import com.vci.ubcs.omd.enums.EnumEnum; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.Objects; @@ -35,13 +39,12 @@ } @Override - public CodeClassifyTemplateButtonVO entityVO(CodeClassifyTemplateButton CodeTempbutton) { - CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = Objects.requireNonNull(BeanUtil.copy(CodeTempbutton, CodeClassifyTemplateButtonVO.class)); + public CodeClassifyTemplateButtonVO entityVO(CodeClassifyTemplateButton CodeTempbuttonDO) { + CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = Objects.requireNonNull(BeanUtil.copy(CodeTempbuttonDO, CodeClassifyTemplateButtonVO.class)); - //User createUser = UserCache.getUser(CodeTempbutton.getCreateUser()); - //User updateUser = UserCache.getUser(CodeTempbutton.getUpdateUser()); - //CodeTempbuttonVO.setCreateUserName(createUser.getName()); - //CodeTempbuttonVO.setUpdateUserName(updateUser.getName()); + if(StringUtils.isNotBlank(CodeTempbuttonDO.getButtonUse())){ + codeClassifyTemplateButtonVO.setButtonUseText(EnumCache.getValue(EnumEnum.CODE_TEMPLATE_BUTTON_USE,CodeTempbuttonDO.getButtonUse())); + } return codeClassifyTemplateButtonVO; } -- Gitblit v1.9.3