|
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.basic.model.QueryOperator;
|
|
|
import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
@@ -89,6 +90,12 @@ public class QueryCriteriaHelper {
|
|
|
wrapper.or(orWrapper -> addOrCondition(orWrapper, fieldValue));
|
|
|
continue;
|
|
|
}
|
|
|
+ // 20210816增加or条件支持
|
|
|
+ if(QueryOperator.RELATION_ID.getIndex().equalsIgnoreCase(field)) {
|
|
|
+ // 内部重新创建QueryWrapper
|
|
|
+ commonAddCondition(wrapper, fieldValue, ObjectDigital.PROP_ID);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
// 20210827增加and(condition OR condition)条件支持
|
|
|
if(QueryOperator.AND_OR.getIndex().equalsIgnoreCase(field)) {
|
|
|
// 内部重新创建QueryWrapper
|