From 53950f0fa04a894a2b3880f2da788c837bd84ead Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 27 十一月 2023 09:25:49 +0800
Subject: [PATCH] 修改码段拼接前后缀时判断码值是否为空,为空时不进行拼接

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.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/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 3e1bc24..4014bcf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -104,7 +104,6 @@
 			// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
 		){
 			//鏄巻鍙叉暟鎹鍏�
-			//鍘嗗彶鏁版嵁鎵ц鐨勬椂鍊欙紝杩欎釜绯荤粺浼氬緢鍗�
 			//涓昏鏄负浜嗗綍鍏ユ渶澶ф祦姘村彿鍜宎llcode
 			//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
 			List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
@@ -419,7 +418,6 @@
 			allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
 				s.setLcStatus(statusMap.get(s.getOid()));
 			});
-
 
 			//閫氳繃ID鏉ヨ繘琛屽幓閲�
 			List<CodeAllCode> distinctCodeAllCOdes = allCodeDOList.stream().collect(Collectors
@@ -772,20 +770,20 @@
 
 	/**
 	 * 鎷兼帴鍓嶅悗缂�
-	 * @param secVO
-	 * @param secValue
+	 * @param secVO 鐮佹
+	 * @param secValue 鐮佸��
 	 * @return
 	 */
 	private String joinPreffixAndSuffix(CodeBasicSecVO secVO, String secValue){
 		StringBuilder joinSecValue = new StringBuilder();
 		// 鎷兼帴鍓嶇紑
-		if (Func.isNotEmpty(secVO.getPrefixCode())) {
+		if (Func.isNotEmpty(secVO.getPrefixCode()) && Func.isNotEmpty(secValue)) {
 			joinSecValue = joinSecValue.append(secVO.getPrefixCode());
 		}
 		// 鍦ㄤ腑闂存嫾鎺ュ��
 		joinSecValue.append(secValue);
 		// 鎷兼帴鍚庣紑
-		if(Func.isNotEmpty(secVO.getSuffixCode())){
+		if(Func.isNotEmpty(secVO.getSuffixCode()) && Func.isNotEmpty(secValue)){
 			joinSecValue = joinSecValue.append(secVO.getSuffixCode());
 		}
 		return joinSecValue.toString();

--
Gitblit v1.9.3