R isError and isSuccess static

RuoYi

2022-10-10 4d72fb4289aef2a1b34677ac598e88f4f98e930e

R isError and isSuccess static

 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,17 +694,19 @@
            // 得到导出对象.

            T vo = (T) list.get(i);

            Collection<?> subList = null;

            if (isSubListValue(vo))

            if (isSubList())

            {

                subList = getListCellValue(vo);

                subMergedLastRowNum = subMergedLastRowNum + subList.size();

                if (isSubListValue(vo))

                {

                    subList = getListCellValue(vo);

                    subMergedLastRowNum = subMergedLastRowNum + subList.size();

                }

                else

                {

                    subMergedFirstRowNum++;

                    subMergedLastRowNum++;

                }

            }

            else

            {

                subMergedFirstRowNum++;

                subMergedLastRowNum++;

            }



            int column = 0;

            for (Object[] os : fields)

            {