作者 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,17 +694,19 @@ public class ExcelUtil<T> @@ -694,17 +694,19 @@ 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 (isSubListValue(vo))  
698 - {  
699 - subList = getListCellValue(vo);  
700 - subMergedLastRowNum = subMergedLastRowNum + subList.size();  
701 - }  
702 - else 697 + if (isSubList())
703 { 698 {
704 - subMergedFirstRowNum++;  
705 - subMergedLastRowNum++; 699 + if (isSubListValue(vo))
  700 + {
  701 + subList = getListCellValue(vo);
  702 + subMergedLastRowNum = subMergedLastRowNum + subList.size();
  703 + }
  704 + else
  705 + {
  706 + subMergedFirstRowNum++;
  707 + subMergedLastRowNum++;
  708 + }
706 } 709 }
707 -  
708 int column = 0; 710 int column = 0;
709 for (Object[] os : fields) 711 for (Object[] os : fields)
710 { 712 {