Browse Source

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

lijie 3 years ago
parent
commit
190813e4f8

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

@@ -245,7 +245,7 @@ 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 ? ObjectRelation.OBJ_FROM : ObjectRelation.OBJ_TO;
-        String whereKey = isFrom ? ObjectRelation.OBJ_TO : ObjectRelation.OBJ_FROM;
+        String whereKey = isFrom ? "objTo" : "objFrom";
         JsonNode relationCond = criteria.get(flagKey);
         // 没有条件不需要处理
         if(relationCond == null || relationCond.size() <= 0 || !relationCond.isObject()) {

+ 2 - 2
dmp-business/dmp-rwd/src/main/resources/bootstrap.yml

@@ -26,11 +26,11 @@ config:
 #  compression:
 #    request:
 #      # 开启请求压缩
-#      enabled: false
+#      enabled: true
 #      # 配置压缩的 MIME TYPE
 #      mime-types: text/xml,application/xml,application/json
 #      # 配置压缩数据大小的下限
 #      min-request-size: 2048
 #    response:
 #      # 开启响应压缩
-#      enabled: false
+#      enabled: true

+ 2 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/config/DigitalFeignConfig.java

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;