From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 22 一月 2025 15:55:27 +0800
Subject: [PATCH] 分类码段码值管理查询去除null的情况,分类码段生成编码时去除码值为null的情况

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
index fb5075c..e46394a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
@@ -117,7 +117,7 @@
 		CodeFixedValue codeFixedValueDO = new CodeFixedValue();
 		BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO);
 		//濉厖涓�浜涢粯璁ゅ��
-		DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE,null);
+		DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE);
 		Long count = this.codeFixedValueMapper.selectCount(Wrappers.<CodeFixedValue>query()
 			.lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedValueDO.getCodeFixedSecOid())
 		)+1L;
@@ -140,7 +140,7 @@
 		CodeFixedValue codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid());
 		revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO);
 		//濉厖涓�浜涢粯璁ゅ��
-		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO,null);
+		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO);
 		boolean resBoolean = codeFixedValueMapper.updateById(codeFixedValueDO) > 0;
 		return resBoolean;
 	}
@@ -343,6 +343,9 @@
 		List<CodeFixedValue> doList = codeFixedValueMapper.selectList(Wrappers.<CodeFixedValue>query()
 			.lambda().eq(CodeFixedValue::getCodeFixedSecOid,codefixedsecoid)
 		);
+		if(doList.isEmpty()){
+			return false;
+		}
 		boolean resBoolean = codeFixedValueMapper.deleteBatchIds(doList.stream().map(CodeFixedValue::getOid).collect(Collectors.toList())) > 0;
 		return resBoolean;
 	}

--
Gitblit v1.9.3