From 65df69ac23c18e05e75912484089529305c0e1dd Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 16 五月 2023 18:19:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
index 15dbf9b..d279695 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
@@ -36,9 +36,8 @@
 		if (StringUtil.isNotBlank(vo.getReferTypeCode())){
 			vo.setReferTypeValue(DictBizCache.getValue(vo.getReferTypeCode(),vo.getReferTypeKey()));
 		}
-		if (StringUtil.isNotBlank(vo.getDictCode())){
-			vo.setDictValue(DictBizCache.getValue(vo.getDictCode(),vo.getDictKey()));
-		}
+		vo.setDictValue(vo.getDictKey());
+		vo.setTypeValue(vo.getTypeKey());
 		return vo;
 	}
 

--
Gitblit v1.9.3