From 4aa0969c384cc51a1975f7e2233b1f82b0035a18 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 30 一月 2024 11:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
index 43e0fb2..fd8b3a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
@@ -16,16 +16,12 @@
*/
package com.vci.ubcs.code.wrapper;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.system.cache.DictCache;
import com.vci.ubcs.code.entity.CodeButton;
import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.redis.cache.BladeRedis;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import java.util.List;
import java.util.Objects;
/**
@@ -42,7 +38,9 @@
@Override
public CodeButtonVO entityVO(CodeButton codebutton) {
- CodeButtonVO codebuttonVO = Objects.requireNonNull(BeanUtil.copy(codebutton, CodeButtonVO.class));
+ CodeButtonVO codebuttonVO = new CodeButtonVO();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codebutton,codebuttonVO);
+ Objects.requireNonNull(codebuttonVO);
codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedPositionType()));
codebuttonVO.setLcStatusText(DictCache.getValue("codeLcstatus", codebutton.getLcStatus()));
return codebuttonVO;
--
Gitblit v1.9.3