Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-18 d3cbcd265d0ee70eca677972403afcff1a0fc990

 home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java

@@ -74,6 +74,9 @@
//                filter += " and "+dataFilter;

//            }

//        }

        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){

            filter   = filter + " and " + queryFilterService.getQueryFilter(fs);

        }

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;