From a1a8c8e0637b77669cfa04154c7282850b50856d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 26 六月 2023 19:33:34 +0800
Subject: [PATCH] secDoList值为空修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 22 ++++++++++++++++------
Source/UBCS-WEB/vue.config.js | 11 +++++------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 90f5f41..2f15032 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,15 +28,14 @@
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- //target: 'http://192.168.1.46:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.46:37000',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
- //target: 'http://192.168.3.7:37000',
- //target: 'http://dev.vci-tech.com:37000',
- //target: 'http://192.168.1.51:37000/',
+ // target: 'http://192.168.3.7:37000',
+ // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.51:37000/',
// target:'http://192.168.1.104:37000',
- //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
+ // 杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
pathRewrite: {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 169e728..7120791 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -792,12 +792,22 @@
public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException {
CodeBasicSecVO codeBasicSecVO = new CodeBasicSecVO();
if (codeBasicSecDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecVO, codeBasicSecVO);
- codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSecVO.getSecType()));
- codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSecVO.getCodeLevelType()));
- codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSecVO.getCodeSecLengthType()));
- codeBasicSecVO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSecVO.getValueCutType()));
- codeBasicSecVO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSecVO.getCodeGetValueType()));
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, codeBasicSecVO);
+ if(StringUtils.isNotBlank(codeBasicSecDO.getSecType())){
+ codeBasicSecVO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDO.getSecType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeLevelType())){
+ codeBasicSecVO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDO.getCodeLevelType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeSecLengthType())){
+ codeBasicSecVO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDO.getCodeSecLengthType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getValueCutType())){
+ codeBasicSecVO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDO.getValueCutType()));
+ }
+ if(StringUtils.isNotBlank(codeBasicSecDO.getCodeGetValueType())){
+ codeBasicSecVO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDO.getCodeGetValueType()));
+ }
// 濡傛灉鏄垎绫荤爜娈甸渶瑕佹煡璇㈡墍灞炲垎绫荤殑涓枃鍚嶇О
if(codeBasicSecDO.getSecType().equals("codeclassifysec") && Func.isNotEmpty(codeBasicSecDO.getParentClassifySecOid())){
CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda()
--
Gitblit v1.9.3