|
@@ -733,9 +733,6 @@ public class QueryUtil {
|
|
|
if (svInner.value_object.getRowChange()) {
|
|
|
result.setRowChange(true);
|
|
|
}
|
|
|
- if (svInner.value_object.hasColChange(split)) {
|
|
|
- result.setColChange(split);
|
|
|
- }
|
|
|
if (index_ != -1) {
|
|
|
throw new Exception(refString);
|
|
|
}
|
|
@@ -747,9 +744,6 @@ public class QueryUtil {
|
|
|
if (svInner.value_array.getRowChange()) {
|
|
|
result.setRowChange(true);
|
|
|
}
|
|
|
- if (svInner.value_array.hasColChange(propertyName)) {
|
|
|
- result.setColChange(split);
|
|
|
- }
|
|
|
for (SceneDataObject sdb : svInner.value_array.set) {
|
|
|
SceneDataObject sod = (SceneDataObject) sdb;
|
|
|
if (sod.containsKey(propertyName) && propertyValue.equals(sod.get(propertyName).value_prim.value)) {
|
|
@@ -762,9 +756,6 @@ public class QueryUtil {
|
|
|
if (svInner.value_array.getRowChange()) {
|
|
|
result.setRowChange(true);
|
|
|
}
|
|
|
- if (svInner.value_array.hasColChange(split)) {
|
|
|
- result.setColChange(split);
|
|
|
- }
|
|
|
for (SceneDataObject sdb : svInner.value_array.set) {
|
|
|
SceneDataObject sod = (SceneDataObject) sdb;
|
|
|
svListInner.add(sod.get(split));
|
|
@@ -776,8 +767,10 @@ public class QueryUtil {
|
|
|
}
|
|
|
result.set = new ArrayList<SceneDataObject>();
|
|
|
for (SceneDataValue svTmp : svList) {
|
|
|
- if (svTmp == null || svTmp.value_array == null) {
|
|
|
- System.out.println();
|
|
|
+ if (!result.getRowChange()) {
|
|
|
+ for (String col : svTmp.value_array.getColChange().keySet()) {
|
|
|
+ result.setColChange(col);
|
|
|
+ }
|
|
|
}
|
|
|
result.set.addAll(svTmp.value_array.set);
|
|
|
}
|