Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 5ccc656f6ed10aaf14b662c3392b07e99b9016e0

 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -44,7 +44,7 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");