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/CodeButtonWrapper.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 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 a516a4d..c178bcd 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,9 +38,11 @@ @Override public CodeButtonVO entityVO(CodeButton codebutton) { - CodeButtonVO codebuttonVO = Objects.requireNonNull(BeanUtil.copy(codebutton, CodeButtonVO.class)); - codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedpositiontype())); - codebuttonVO.setLcStatusText(DictCache.getValue("codeLcstatus", codebutton.getLcstatus())); + 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