作者 RuoYi

R isError and isSuccess static

@@ -103,13 +103,13 @@ public class R<T> implements Serializable @@ -103,13 +103,13 @@ public class R<T> implements Serializable
103 this.data = data; 103 this.data = data;
104 } 104 }
105 105
106 - public Boolean isError() 106 + public static <T> Boolean isError(R<T> ret)
107 { 107 {
108 - return !isSuccess(); 108 + return !isSuccess(ret);
109 } 109 }
110 110
111 - public Boolean isSuccess() 111 + public static <T> Boolean isSuccess(R<T> ret)
112 { 112 {
113 - return R.SUCCESS == getCode(); 113 + return R.SUCCESS == ret.getCode();
114 } 114 }
115 } 115 }
@@ -694,6 +694,8 @@ public class ExcelUtil<T> @@ -694,6 +694,8 @@ public class ExcelUtil<T>
694 // 得到导出对象. 694 // 得到导出对象.
695 T vo = (T) list.get(i); 695 T vo = (T) list.get(i);
696 Collection<?> subList = null; 696 Collection<?> subList = null;
  697 + if (isSubList())
  698 + {
697 if (isSubListValue(vo)) 699 if (isSubListValue(vo))
698 { 700 {
699 subList = getListCellValue(vo); 701 subList = getListCellValue(vo);
@@ -704,7 +706,7 @@ public class ExcelUtil<T> @@ -704,7 +706,7 @@ public class ExcelUtil<T>
704 subMergedFirstRowNum++; 706 subMergedFirstRowNum++;
705 subMergedLastRowNum++; 707 subMergedLastRowNum++;
706 } 708 }
707 - 709 + }
708 int column = 0; 710 int column = 0;
709 for (Object[] os : fields) 711 for (Object[] os : fields)
710 { 712 {