Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java

@@ -130,7 +130,7 @@
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
      IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
      return R.data(pages);
   }

@@ -254,6 +254,12 @@
      }
      query.setCurrent(queryObject.getPage());
      query.setSize(queryObject.getLimit());
      if(queryObject.getOrder().equals("asc")){
         query.setAscs(queryObject.getSort());
      }else{
         query.setDescs(queryObject.getSort());
      }

      IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
      return R.data(pages);
   }