From c0c75703071327c172f9dfbe14f2ca47abfa10a5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:35:57 +0800
Subject: [PATCH] bug列表158(所有规则增加前缀、后缀属性,并在申请编码时进行前后缀拼接)修复;集成系统信息管理,创建修改删除,同步到用户的账号创建、删除、修改操作。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeTempbuttonWrapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 1a2d263..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,9 +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;
@@ -39,7 +42,9 @@
 	public CodeClassifyTemplateButtonVO entityVO(CodeClassifyTemplateButton CodeTempbuttonDO) {
 		CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = Objects.requireNonNull(BeanUtil.copy(CodeTempbuttonDO, CodeClassifyTemplateButtonVO.class));
 
-		codeClassifyTemplateButtonVO.setButtonUseText(CodeButtonUseEnum.getTextByValue(CodeTempbuttonDO.getButtonUse()));
+		if(StringUtils.isNotBlank(CodeTempbuttonDO.getButtonUse())){
+			codeClassifyTemplateButtonVO.setButtonUseText(EnumCache.getValue(EnumEnum.CODE_TEMPLATE_BUTTON_USE,CodeTempbuttonDO.getButtonUse()));
+		}
 
 		return codeClassifyTemplateButtonVO;
 	}

--
Gitblit v1.9.3