|
@@ -14,6 +14,7 @@ import com.persagy.dmp.basic.model.QueryOperator;
|
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
|
import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
@@ -243,8 +244,8 @@ public class ObjectDigitalCriteriaHelper {
|
|
|
*/
|
|
|
private static void ensureRelationIds(ObjectNode criteria, boolean isFrom) {
|
|
|
String flagKey = isFrom ? QueryOperator.RELATION_FROM.getIndex() : QueryOperator.RELATION_TO.getIndex();
|
|
|
- String selectKey = isFrom ? "objFrom" : "objTo";
|
|
|
- String whereKey = isFrom ? "objTo" : "objFrom";
|
|
|
+ String selectKey = isFrom ? ObjectRelation.OBJ_FROM : ObjectRelation.OBJ_TO;
|
|
|
+ String whereKey = isFrom ? ObjectRelation.OBJ_TO : ObjectRelation.OBJ_FROM;
|
|
|
JsonNode relationCond = criteria.get(flagKey);
|
|
|
// 没有条件不需要处理
|
|
|
if(relationCond == null || relationCond.size() <= 0 || !relationCond.isObject()) {
|