From 84ee37e1f485a1d3136535f9ef1c43058d9308ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 11:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
index f5c59e7..9e3838d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.util.ArrayList;
+import java.util.Locale;
@Data
public class ClientBusinessObject extends BaseModel {
@@ -35,7 +36,7 @@
}
public void setAttributeValueWithNoCheck(String attributeName, String attributeValue, boolean isCreate) throws VciBaseException {
- /*if (isCreate) {//&& BusinessConstants.BO_CONSTANTS.containsKey(attributeName.toUpperCase())
+ /*if (isCreate) {//&& BusinessConstants.BO_CONSTANTS.containsKey(attributeName.toLowerCase(Locale.ROOT))
this.setConstantsAttrVal(attributeName, attributeValue);
} else {*/
AttributeValue[] attrValues = this.newAttrValList;
@@ -57,7 +58,7 @@
for(i = 0; i < attrValList.size(); ++i) {
attrVal = (AttributeValue)attrValList.get(i);
- if (attrVal.attrName.toUpperCase().equals(attributeName.toUpperCase())) {
+ if (attrVal.attrName.toLowerCase(Locale.ROOT).equals(attributeName.toLowerCase(Locale.ROOT))) {
attrVal.attrVal = attributeValue;
isExist = true;
break;
@@ -66,12 +67,12 @@
if (!isExist) {
attrVal = new AttributeValue();
- attrVal.attrName = attributeName.toUpperCase();
+ attrVal.attrName = attributeName.toLowerCase(Locale.ROOT);
attrVal.attrVal = attributeValue;
attrValList.add(attrVal);
}
- this.getData().put(attributeName,attributeValue);
+ this.getData().put(attributeName.toLowerCase(Locale.ROOT),attributeValue);
this.newAttrValList = (AttributeValue[])attrValList.toArray(new AttributeValue[attrValList.size()]);
// }
}
@@ -82,7 +83,7 @@
int i;
if (this.newAttrValList != null) {
for(i = 0; i < this.newAttrValList.length; ++i) {
- if (this.newAttrValList[i].attrName.toUpperCase().equals(attrName.toUpperCase())) {
+ if (this.newAttrValList[i].attrName.toLowerCase(Locale.ROOT).equals(attrName.toLowerCase(Locale.ROOT))) {
existInNewAttr = true;
res = this.newAttrValList[i].attrVal;
}
@@ -95,7 +96,7 @@
return "";
} else {
for(i = 0; i < this.hisAttrValList.length; ++i) {
- if (this.hisAttrValList[i].attrName.toUpperCase().equals(attrName.toUpperCase())) {
+ if (this.hisAttrValList[i].attrName.toLowerCase(Locale.ROOT).equals(attrName.toLowerCase(Locale.ROOT))) {
res = this.hisAttrValList[i].attrVal;
}
}
--
Gitblit v1.9.3