LiTaohong 7 лет назад
Родитель
Сommit
97d3d6bcb7

+ 1 - 1
svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataSearchController.java

@ -104,7 +104,7 @@ public class DataSearchController {
    public Envelop delete(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
        try{
            String str = dataSearchService.updateData(jsonData);
            if(!StringUtils.equalsIgnoreCase("success",str)){
            if(!StringUtils.equalsIgnoreCase("true",str)){
                return Envelop.getSuccess(DataRequestMapping.DataSearch.message_fail,str);
            }
            return Envelop.getSuccess(DataRequestMapping.DataSearch.delete_success,str);

+ 2 - 2
svr/svr-iot/src/main/java/com/yihu/iot/datainput/service/DataSearchService.java

@ -266,9 +266,9 @@ public class DataSearchService {
                }
                field = nestedPath + "." + field;
            }
            if(null == condition){
            if("null".equals(condition)){
                MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchPhraseQuery(field, value);
                if(null == andOr) {
                if("null".equals(andOr)) {
                    boolQueryBuilder.must(matchQueryBuilder);
                }
            }else if(condition.equals("=")) {