From cc38b5ae62eebcd80aebe41457629b12e26b9e84 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 01 二月 2024 15:04:13 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 da10e36..c7f69cf 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
@@ -122,6 +122,7 @@
* 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
*/
public static final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
+
/**
* 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
* @param wrapper 鏌ヨ灏佽鍣�
@@ -562,7 +563,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鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊わ紝鑰屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞�
+ // TODO: 2024-1-24 23:25鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊ゅ拰鍒嗙被鎼滅储鍔熻兘锛岃�屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞�
doList = codeClassifyMapper
.selectCodeClassifyDOByTree(
treeQueryObject.getConditionMap().get("id"),
@@ -1458,11 +1459,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);
}
}
@@ -1526,7 +1527,5 @@
wrapper.eq("parentCodeClassifyOid",codeClassifyOid);
return codeClassifyMapper.selectCount(wrapper).intValue();
}
-
-
}
--
Gitblit v1.9.3