Merge branch 'yantai_dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into yantai_dev

src/views/components/resiSearch.vue

@@ -520,7 +520,8 @@ export default {
                 : [this.form[item.columnName].toString()]),
           };
         });
-      const arr2 = arr.filter((item) => item.columnValue.length > 0);
+        console.log(arr);
+      const arr2 = arr.filter((item) =>  item.columnValue != null&& item.columnValue.length > 0);
       let arr1 = this.fixedList
         .filter((n) => n.columnValue.length > 0)
         .map((item) => {