R isError and isSuccess static
This commit is contained in:
parent
186c04d90a
commit
4d72fb4289
|
@ -103,13 +103,13 @@ public class R<T> implements Serializable
|
||||||
this.data = data;
|
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -694,17 +694,19 @@ public class ExcelUtil<T>
|
||||||
// 得到导出对象.
|
// 得到导出对象.
|
||||||
T vo = (T) list.get(i);
|
T vo = (T) list.get(i);
|
||||||
Collection<?> subList = null;
|
Collection<?> subList = null;
|
||||||
if (isSubListValue(vo))
|
if (isSubList())
|
||||||
{
|
{
|
||||||
subList = getListCellValue(vo);
|
if (isSubListValue(vo))
|
||||||
subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
{
|
||||||
|
subList = getListCellValue(vo);
|
||||||
|
subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
subMergedFirstRowNum++;
|
||||||
|
subMergedLastRowNum++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
subMergedFirstRowNum++;
|
|
||||||
subMergedLastRowNum++;
|
|
||||||
}
|
|
||||||
|
|
||||||
int column = 0;
|
int column = 0;
|
||||||
for (Object[] os : fields)
|
for (Object[] os : fields)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue