From 633d328380d7788740d3eba54b33aa69dc9afb02 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 25 一月 2024 22:14:38 +0800
Subject: [PATCH] 点击分类不显示按钮(模板创建时绑定的业务类型id有问题):改成用functionid进行查询,也就是菜单上配置的id

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

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 aced92e..01c5850 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
@@ -562,6 +562,7 @@
 		}
 		if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
 			//String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
+			// TODO: 2024-1-24 23:25鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊わ紝鑰屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞�
 			doList = codeClassifyMapper
 				.selectCodeClassifyDOByTree(
 					treeQueryObject.getConditionMap().get("id"),
@@ -598,11 +599,8 @@
 			if(!viewClassByRoleIds.isSuccess() && viewClassByRoleIds.getData().isEmpty()){
 				throw new ServiceException("涓绘暟鎹煡鐪嬫潈闄愭湭閰嶇疆锛屾垨閰嶇疆鏈夎锛�");
 			}
-			long startTime = System.currentTimeMillis();
 			// 杩囨护
 			filterTreeNodes(tree,viewClassByRoleIds.getData());
-			long endTime = System.currentTimeMillis();
-			System.out.println(("鎵ц鏃堕棿锛�"+(endTime-startTime)/1000)+"s");
 		}
 		// 鍔犺浇鍒嗙被鏄惁鍏锋湁瀛愬垎绫�
 		tree.parallelStream().forEach(item -> {
@@ -624,7 +622,7 @@
 			/*Boolean checkHasChild = checkHasChild(tree.getOid());
 			tree.setLeaf(!checkHasChild);*/
 			if (classifyIds.contains(tree.getOid())) {
-				// 濡傛灉椤跺眰鑺傜偣瀛樺湪浜� classifyIds 涓紝鐩存帴淇濈暀鍏跺瓙鑺傜偣闆嗗悎
+				// 濡傛灉椤跺眰鑺傜偣瀛樺湪 classifyIds 锛岀洿鎺ヤ繚鐣欏叾瀛愯妭鐐归泦鍚�
 				continue;
 			}
 			if (tree.getChildren() != null && !tree.getChildren().isEmpty()) {
@@ -1460,11 +1458,11 @@
 		if(!CollectionUtils.isEmpty(dataList)){
 			for(Map data:dataList){
 				CodeClassify codeClassifyDO = new CodeClassify();
-				codeClassifyDO.setOid(VciBaseUtil.getStringValueFromObject(data.get("OID")));
-				codeClassifyDO.setId(VciBaseUtil.getStringValueFromObject(data.get("ID")));
-				codeClassifyDO.setName(VciBaseUtil.getStringValueFromObject(data.get("NAME")));
-				codeClassifyDO.setBtmTypeId(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPEID")));
-				codeClassifyDO.setBtmTypeName(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPENAME")));
+				codeClassifyDO.setOid(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"OID")));
+				codeClassifyDO.setId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"ID")));
+				codeClassifyDO.setName(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"NAME")));
+				codeClassifyDO.setBtmTypeId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"BTMTYPEID")));
+				codeClassifyDO.setBtmTypeName(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"BTMTYPENAME")));
 				oidList.add(codeClassifyDO);
 			}
 		}

--
Gitblit v1.9.3