|
|
@@ -451,7 +451,8 @@ public class MyDbHelper {//目前只差主键的条件优化
|
|
|
filterList.get(filterList.size() - 1).put("connector", "lastConnector");//去掉最后一个连接符，减少whereStr字符串的处理
|
|
|
for (Map<String, Object> filterMap : filterList) {//循环条件参数集合
|
|
|
Object column = filterMap.get("column");//获取列名
|
|
|
- if (Objects.nonNull(column) && !varList.contains(column.toString()) && (MapTools.isBlank(allSQLColumn) || allSQLColumn.contains(column.toString()))) {//列名不为空 且 (可用列未获取 或者 当前列存在于可用列)
|
|
|
+// && (MapTools.isBlank(allSQLColumn) || allSQLColumn.contains(column.toString()))
|
|
|
+ if (Objects.nonNull(column) && !varList.contains(column.toString())) {//列名不为空 且 (可用列未获取 或者 当前列存在于可用列)
|
|
|
String connector = Objects.isNull(filterMap.get("connector")) ? "" : filterMap.get("connector").toString();//处理连接字符串
|
|
|
Object comparator = Objects.isNull(filterMap.get("comparator")) ? "" : filterMap.get("comparator").toString();//比较符
|
|
|
whereStr = whereStr.concat(filterMap.get("left").toString())
|
|
|
@@ -534,8 +535,8 @@ public class MyDbHelper {//目前只差主键的条件优化
|
|
|
}
|
|
|
|
|
|
if ("1,2".contains(event)) {
|
|
|
- List<String> priColumn = tablePrimaryKey.get(tableName);
|
|
|
- priColumn.forEach(allColumn::remove);
|
|
|
+// List<String> priColumn = tablePrimaryKey.get(tableName);
|
|
|
+// priColumn.forEach(allColumn::remove);
|
|
|
List<String> modyColumn = new ArrayList<>();
|
|
|
Map<String, Object> currentParam = signParam.containsKey("Value") ? (Map<String, Object>) signParam.get("Value") : signParam;//如果存在value则取value否则取当前MAP
|
|
|
for (String signKey : currentParam.keySet()) {//循环当前参数
|
pms