RuoYi
2022-10-10 4d72fb4289aef2a1b34677ac598e88f4f98e930e
R isError and isSuccess static
已修改2个文件
12 ■■■■■ 文件已修改
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -103,13 +103,13 @@
        this.data = data;
    }
    public Boolean isError()
    public static <T> Boolean isError(R<T> ret)
    {
        return !isSuccess();
        return !isSuccess(ret);
    }
    public Boolean isSuccess()
    public static <T> Boolean isSuccess(R<T> ret)
    {
        return R.SUCCESS == getCode();
        return R.SUCCESS == ret.getCode();
    }
}
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -694,6 +694,8 @@
            // 得到导出对象.
            T vo = (T) list.get(i);
            Collection<?> subList = null;
            if (isSubList())
            {
            if (isSubListValue(vo))
            {
                subList = getListCellValue(vo);
@@ -704,7 +706,7 @@
                subMergedFirstRowNum++;
                subMergedLastRowNum++;
            }
            }
            int column = 0;
            for (Object[] os : fields)
            {