gaoyu 3 роки тому
батько
коміт
28d27f84a0

+ 2 - 1
src/main/java/com/persagy/apm/dmpalarm/criteria/CriteriaUtils.java

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.gson.JsonArray;
 import com.persagy.apm.dmpalarm.criteria.JsonCriteria.Order;
 import com.persagy.apm.dmpalarm.utils.UtilsTools;
 import com.persagy.apm.dmpalarm.web.PagedResponse;
@@ -82,7 +83,7 @@ public class CriteriaUtils {
 							break;
 						case "$in":
 							if (value instanceof List) {
-								List<Object> valueList = (List<Object>) columnValue;
+								List<Object> valueList = (List<Object>) value;
 								queryWrapper.in(UtilsTools.humpToLine(fieldName), typeConversion(valueList, type.getTypeName()));
 							} else {
 								queryWrapper.eq(UtilsTools.humpToLine(fieldName), typeConversion(value, type.getTypeName()));