Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -45,7 +45,6 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        sysUser.setDepartmentId("1202");
        List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {