|
@@ -73,13 +73,17 @@ public class RmsLineController extends BaseRESTfulController {
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
Integer apiId,
|
|
|
- String con){
|
|
|
+ String con,
|
|
|
+ Integer lineType){
|
|
|
|
|
|
if(con != null){
|
|
|
if(!"".equals(con) && !"null".equals(con)){
|
|
|
mapValue.put("index", con);
|
|
|
}
|
|
|
}
|
|
|
+ if(lineType != null&&lineType == 1){
|
|
|
+ mapValue.put("lineType",1);
|
|
|
+ }
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
//分页查询数据
|
|
|
List<Map<String, Object>> columnList = rmsLineMapper.getAllLineDesk(mapValue);
|