Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-23 d8ba5dda56e0065874e9ed707e875732b3af7995

Merge remote-tracking branch 'origin/master'

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

@@ -51,7 +51,7 @@
            filter    = filter + " and " + queryFilterService.getQueryFilter(fs);

        }

//        fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)

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

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_NOTICE_PUNISHMENT,filter, null,null," no00 desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -81,7 +81,7 @@
        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){

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

        }

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

        DataTableEntity dt = baseDao.listTable(CmnConst.GWJDSPB,filter,null,null," gw00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -50,7 +50,7 @@
        if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {

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

        }

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

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_XZZFSPB, filter, null, null, " ax00 desc ", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -81,7 +81,7 @@
                filter += " and "+dataFilter;

            }

        }

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

        DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB,filter,null,null," bg00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -84,7 +84,7 @@
        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){

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

        }

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

        DataTableEntity dt = baseDao.listTable(CmnConst.BGSYPCGB,filter,null,null," bg00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -49,7 +49,7 @@
        if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {

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

        }

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

        DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB, filter, null, null, " bg00 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }


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

@@ -77,7 +77,7 @@
        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));

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

        baseDao.loadPromptData(dt);

        return dt;

    }