@@ -4901,8 +4901,12 @@ else if (userId instanceof Subquery) {}
4901
4901
//强制作为条件且放在最前面优化性能
4902
4902
request .remove (idKey );
4903
4903
request .remove (idInKey );
4904
- request .remove (userIdKey );
4905
- request .remove (userIdInKey );
4904
+ /**
4905
+ * modify by gouchy chen
4906
+ * 不删除相应的字段
4907
+ */
4908
+ //request.remove(userIdKey);
4909
+ //request.remove(userIdInKey);
4906
4910
//关键词
4907
4911
request .remove (KEY_ROLE );
4908
4912
request .remove (KEY_EXPLAIN );
@@ -5088,11 +5092,11 @@ else if (userId instanceof Subquery) {}
5088
5092
}
5089
5093
5090
5094
if (StringUtil .isNotEmpty (combineExpr , true )) {
5091
- List <String > banKeyList = Arrays .asList (idKey , idInKey , userIdKey , userIdInKey );
5095
+ List <String > banKeyList = Arrays .asList (idKey , idInKey );
5092
5096
for (String key : banKeyList ) {
5093
5097
if (keyInCombineExpr (combineExpr , key )) {
5094
5098
throw new UnsupportedOperationException (table + ":{} 里的 @combine:value 中的 value 里 " + key + " 不合法!"
5095
- + "不允许传 [" + idKey + ", " + idInKey + ", " + userIdKey + ", " + userIdInKey + " ] 其中任何一个!" );
5099
+ + "不允许传 [" + idKey + ", " + idInKey + "] 其中任何一个!" );
5096
5100
}
5097
5101
}
5098
5102
}
@@ -5128,9 +5132,9 @@ else if (w.startsWith("!")) {
5128
5132
throw new IllegalArgumentException (table + ":{} 里的 @combine:value 中的value里条件 " + ws [i ] + " 不合法!不允许为空值!" );
5129
5133
}
5130
5134
else {
5131
- if (idKey .equals (w ) || idInKey .equals (w ) || userIdKey . equals ( w ) || userIdInKey . equals ( w ) ) {
5135
+ if (idKey .equals (w ) || idInKey .equals (w )) {
5132
5136
throw new UnsupportedOperationException (table + ":{} 里的 @combine:value 中的 value 里 " + ws [i ] + " 不合法!"
5133
- + "不允许传 [" + idKey + ", " + idInKey + ", " + userIdKey + ", " + userIdInKey + " ] 其中任何一个!" );
5137
+ + "不允许传 [" + idKey + ", " + idInKey + "] 其中任何一个!" );
5134
5138
}
5135
5139
}
5136
5140
0 commit comments