From e61a898fe563214cb13e97c08804534a61aad46b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 17:32:40 +0800
Subject: [PATCH] 主数据管理按钮返回缓存问题修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java                    |    1 -
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue                                                     |    5 +----
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java  |    2 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java    |    2 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java |    1 -
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java        |    2 +-
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index fdd81b1..3a5e81f 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -1656,7 +1656,4 @@
   width: 500px;
 }
 
-</style>
-/sa[pr
-[
-syulep
+</style>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
index a5bd305..da2484e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
@@ -27,7 +27,6 @@
 	 */
 	String createImportExcel(String codeClassifyOid,boolean isHistory);
 
-
 	/**
 	 * 鐢熸垚瀵煎叆鐨勬枃浠�
 	 * @param codeClassifyOid 鍒嗙被鐨勪富閿�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index e582061..c41aada 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -1264,7 +1264,7 @@
 			return null;
 		}
 		List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
-					if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
+					if(Objects.equals(tree.getAttributes().get("btmTypeId"), btmType.getId())){
 						tree.getAttributes().put("btmTypeOid",btmType.getOid());
 						return true;
 					}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index eb026fd..a33819e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -1093,7 +1093,6 @@
 		return codeClassifyTemplateVOList;
 	}
 
-
 	/**
 	 * 浣跨敤鍒嗙被涓婚敭閫掑綊鏌ヨ
 	 * @param codeClassifyOid 鍒嗙被鐨勪富閿�
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 81be733..a0cc22d 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
@@ -126,7 +126,7 @@
 							start += VciBaseUtil.getInt(secLengths[j]);
 						}
 						thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[i]));
-				//	}
+					//	}
 					if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){
 						serialUnitList.add(thisSecValue);
 					}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index b2b00e7..035269d 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -317,7 +317,7 @@
 	 * @return List<Menu>
 	 */
     @Override
-	@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:' + #userId")
+	@Cacheable(cacheNames = MENU_CACHE, key = "'auth:menuButton:'+ #btmType +':'+ #userId ")
     public List<Menu> getMenuButtonByType(String btmType,Long userId) {
 		List<String> roleIds = null;
 		if(!VciBaseUtil.checkAdminTenant()){

--
Gitblit v1.9.3