dsfdfsd

src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java

@@ -130,12 +130,13 @@ public class RmsWarehouseController extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 String con) {
-
-        List<Map<String,Object>>   listTotal = rmsWarehouseService.getWarehouseList(mapValue);
+        if(con != null && !"null".equals(con) && !"".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsWarehouseService.getWarehouseList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -454,7 +454,11 @@
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
     WHERE RW.DELETED!=1
+    <if test="con != null">
+      and RW.WAREHOUSE_NAME LIKE #{con}
+    </if>
     ORDER BY RW.INSERT_TIME DESC
+
     )
     <where>
       <if test="warehouseId!= null">