Browse Source

修复/object/query根据关系查询时字段不存在的bug

lijie 3 years ago
parent
commit
bdc2216e90

+ 3 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java

@@ -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()) {

+ 4 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectRelation.java

@@ -17,6 +17,10 @@ import javax.validation.constraints.NotNull;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "dt_relation", autoResultMap = true)
 public class ObjectRelation extends AuditableEntity {
+
+    public static final String OBJ_FROM="obj_from";
+    public static final String OBJ_TO="obj_to";
+
     /** 项目ID */
     private String projectId;
     /** 集团编码 */

+ 1 - 1
docker/dockerfiles/dmp-dic/Dockerfile

@@ -25,7 +25,7 @@ RUN mkdir -p $WORKER_HOME/config
 COPY *.jar $WORKER_HOME/app.jar
 COPY entrypoint.sh $WORKER_HOME/
 COPY version.txt $WORKER_HOME/
-COPY config/* $WORKER_HOME/config/
+COPY config $WORKER_HOME/config
 #设置工作目录
 WORKDIR $WORKER_HOME
 

+ 1 - 1
docker/dockerfiles/dmp-file/Dockerfile

@@ -25,7 +25,7 @@ RUN mkdir -p $WORKER_HOME/config
 COPY *.jar $WORKER_HOME/app.jar
 COPY entrypoint.sh $WORKER_HOME/
 COPY version.txt $WORKER_HOME/
-COPY config/* $WORKER_HOME/config/
+COPY config $WORKER_HOME/config
 #设置工作目录
 WORKDIR $WORKER_HOME
 

+ 1 - 1
docker/dockerfiles/dmp-rwd-version/Dockerfile

@@ -25,7 +25,7 @@ RUN mkdir -p $WORKER_HOME/config
 COPY *.jar $WORKER_HOME/app.jar
 COPY entrypoint.sh $WORKER_HOME/
 COPY version.txt $WORKER_HOME/
-COPY config/* $WORKER_HOME/config/
+COPY config $WORKER_HOME/config
 #设置工作目录
 WORKDIR $WORKER_HOME
 

+ 1 - 1
docker/dockerfiles/dmp-rwd/Dockerfile

@@ -25,7 +25,7 @@ RUN mkdir -p $WORKER_HOME/config
 COPY *.jar $WORKER_HOME/app.jar
 COPY entrypoint.sh $WORKER_HOME/
 COPY version.txt $WORKER_HOME/
-COPY config/* $WORKER_HOME/config/
+COPY config $WORKER_HOME/config
 #设置工作目录
 WORKDIR $WORKER_HOME