Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

shichongfu

2023-05-23 41cae1609d4dd406e0903a98d27f497771eb7024

Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

 home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java

@@ -98,7 +98,7 @@
                return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());

            }

            //判断表名是否正常

            if (!CmnConst.FWGZ.equals(fse.getTableName())) {

            if (!CmnConst.FWGZ.equals(fse.getTableName())&&!CmnConst.SFGL.equals(fse.getTableName())) {

                SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());

                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());

            }


 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

@@ -28,10 +28,10 @@
    PermissionService permissionService;

    @Autowired

    QueryFilterService queryFilterService;

	


    /**

     * 获取办公室用品采购单列表

     * 
     *

     * @param fs

     * @return

     * @throws BaseException

@@ -49,14 +49,14 @@
        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;

    }



    /**

     * 获取办公室用品采购单详情

     * 
     *

     * @param fs

     * @return

     * @throws BaseException

@@ -64,11 +64,11 @@
    public FieldSetEntity getOfficePurchaseInfo(FieldSetEntity fs) throws BaseException {

        return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.BGYPLYB, fs.getString(CmnConst.UUID), true), null);

    }

	
	




    /**

     * 保存办公室用品采购单

     * 
     *

     * @param fs

     * @return

     */

@@ -88,7 +88,7 @@


    /**

     * 删除办公室用品采购单

     * 
     *

     * @param fs

     * @return

     */


 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;

    }


 product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java

@@ -472,7 +472,8 @@
            if (menuEntities != null) {
                if (0 == user_type) {
                    for (MenuEntity menuEntity : menuEntities) {
                        if ("1".equals(menuEntity.getFunction_type())) {
                        //普通用户允许访问的菜单绑定的功能类型
                        if (StringUtils.equalsAny(menuEntity.getFunction_type(), "1", "5")) {
                            functionSet.add(menuEntity);
                        }
                    }