ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix numberUtil

Browse Source
This commit is contained in:
Looly 2020-09-28 08:35:05 +08:00
parent d014ccdf0c
commit e573fa48e7
3 changed files with 136 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@
* 【poi 】 增加SheetReader和XXXRowHandler（issue#I1WHJP@Gitee）
* 【dfa 】 增加过滤符号（pr#1122@Github）
* 【dfa 】 SensitiveUtil增加setCharFilter方法（pr#1123@Github）
* 【all 】 优化常量大小写规范（pr#188@Gitee）
### Bug修复
* 【crypto 】 修复SM2验签后无法解密问题（issue#I1W0VP@Gitee）

12
hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTableUtil.java
View File

@ -20,11 +20,11 @@ public class ConsoleTableUtil {
/**
* 表格头信息
*/
private List<List<String>> headerList = new ArrayList<>();
private final List<List<String>> HEADER_LIST = new ArrayList<>();
/**
* 表格体信息
*/
private List<List<String>> bodyList = new ArrayList<>();
private final List<List<String>> BODY_LIST = new ArrayList<>();
/**
* 添加头信息
@ -35,7 +35,7 @@ public class ConsoleTableUtil {
public ConsoleTableUtil addHeader(String... columns) {
columnCharNumber = new ArrayList<>(Collections.nCopies(columns.length, 0));
List<String> l = new ArrayList<>();
headerList.add(l);
HEADER_LIST.add(l);
for (int i = 0; i < columns.length; i++) {
String column = columns[i];
String col = Convert.toSBC(column);
@ -54,7 +54,7 @@ public class ConsoleTableUtil {
*/
public ConsoleTableUtil addBody(String... values) {
List<String> l = new ArrayList<>();
bodyList.add(l);
BODY_LIST.add(l);
for (int i = 0; i < values.length; i++) {
String value = values[i];
String val = Convert.toSBC(value);
@ -75,7 +75,7 @@ public class ConsoleTableUtil {
public String toString() {
StringBuilder sb = new StringBuilder();
border(sb);
for (List<String> headers : headerList) {
for (List<String> headers : HEADER_LIST) {
for (int i = 0; i < headers.size(); i++) {
if (i == 0) {
sb.append('|');
@ -96,7 +96,7 @@ public class ConsoleTableUtil {
sb.append('\n');
}
border(sb);
for (List<String> bodys : bodyList) {
for (List<String> bodys : BODY_LIST) {
for (int i = 0; i < bodys.size(); i++) {
if (i == 0) {
sb.append('|');

7
hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
View File

@ -1713,11 +1713,8 @@ public class NumberUtil {
*/
public static boolean equals(BigDecimal bigNum1, BigDecimal bigNum2) {
//noinspection NumberEquality
/*if (bigNum1 == bigNum2){
return true;
}*/
// 如果要进行null判断,那直接进行判断null,而不是使用 == 来判断容易引起误解
if (bigNum1 == null && bigNum2 == null){
if (bigNum1 == bigNum2){
// 如果用户传入同一对象，省略compareTo以提高性能。
return true;
}
if (bigNum1==null || bigNum2==null){