Просмотр исходного кода

删除多余的style重复赋值

RuoYi лет назад: 3
Родитель
Сommit
62eec4df51

+ 5 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -103,11 +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 Boolean isError()
107
+    {
107
         return !isSuccess();
108
         return !isSuccess();
108
     }
109
     }
109
-    
110
-    public Boolean isSuccess() {
110
+
111
+    public Boolean isSuccess()
112
+    {
111
         return R.SUCCESS == getCode();
113
         return R.SUCCESS == getCode();
112
     }
114
     }
113
 }
115
 }

+ 0 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -681,7 +681,6 @@ public class ExcelUtil<T>
681
             if (!headerStyles.containsKey(key))
681
             if (!headerStyles.containsKey(key))
682
             {
682
             {
683
                 CellStyle style = wb.createCellStyle();
683
                 CellStyle style = wb.createCellStyle();
684
-                style = wb.createCellStyle();
685
                 style.cloneStyleFrom(styles.get("data"));
684
                 style.cloneStyleFrom(styles.get("data"));
686
                 style.setAlignment(HorizontalAlignment.CENTER);
685
                 style.setAlignment(HorizontalAlignment.CENTER);
687
                 style.setVerticalAlignment(VerticalAlignment.CENTER);
686
                 style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -715,7 +714,6 @@ public class ExcelUtil<T>
715
             if (!styles.containsKey(key))
714
             if (!styles.containsKey(key))
716
             {
715
             {
717
                 CellStyle style = wb.createCellStyle();
716
                 CellStyle style = wb.createCellStyle();
718
-                style = wb.createCellStyle();
719
                 style.setAlignment(excel.align());
717
                 style.setAlignment(excel.align());
720
                 style.setVerticalAlignment(VerticalAlignment.CENTER);
718
                 style.setVerticalAlignment(VerticalAlignment.CENTER);
721
                 style.setBorderRight(BorderStyle.THIN);
719
                 style.setBorderRight(BorderStyle.THIN);