Browse Source

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java
lijie 3 years ago
parent
commit
b2fc2224d2

+ 0 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -20,7 +20,6 @@ import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
-import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
@@ -36,11 +35,9 @@ import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
 import com.persagy.dmp.rwd.parser.service.InfoDataFactory;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

@@ -145,8 +145,10 @@ public class ObjectDigitalCriteriaHelper {
             ObjectNode obj = (ObjectNode) value;
             if (obj.has("$like")) {
                 format = "#JSON#json_unquote(json_extract({}, '$.{}'))";
-            } else {
-                for (String key : Arrays.asList("$gt", "$lt", "$gte", "$lte", "$ne", "$null")) {
+            } else if (obj.has(QueryOperator.NULL.getIndex())) {
+                format = "#JSON#json_extract({}, '$.{}')";
+            }else {
+                for (String key : Arrays.asList("$gt", "$lt", "$gte", "$lte", "$ne")) {
                     if (obj.has(key)) {
                         // 递归处理
                         return ensureFormatKey(infoCode, obj.get(key));