提交代码

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

@@ -177,7 +177,11 @@ public class RmsCapacityController extends BaseRESTfulController {
                 mapValue.put("index", con);
             }
         }
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum==null&&pageSize==null){
+
+        }else {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);
         //获取样式

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

@@ -900,6 +900,7 @@
               RCC.CAPACITY_USER_DEP "userDep",
               RC.CAPACITY_NUMBER "capacityNumber",
               RC.CAPACITY_ID "capacityId",
+              RC.CAPACITY_TEL "capacityTel",
               RC.CAPACITY_VIP "capacityVip",
               RC.CAPACITY_GPS "capacityGps",
               RC2.CARRIER_NAME "carrierName"