Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

18516761980

2022-05-24 b76c09d2c5f16de0e3777350b8d7ab48ea55aaa8

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -67,7 +67,10 @@
      ViewStayTimeBean bean = new ViewStayTimeBean();
      bean.setPageSize(limit);
      bean.setPageNumber(curr);
      bean.setLoc_no(String.valueOf(param.get("loc_no")));
      String locNo = String.valueOf(param.get("loc_no"));
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
      Page<ViewStayTimeBean> page = new Page<>();