lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-09 17:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复boolean无法对比问题

Browse Source
This commit is contained in:
zhou-hao
2020-03-17 17:09:02 +08:00
parent 1315f1ca27
commit 12914ec8f7
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hsweb-core/src/main/java/org/hswebframework/web/bean/CompareUtils.java
View File

@@ -240,17 +240,10 @@ public abstract class CompareUtils {
}
public static boolean compare(Boolean bool, Object target) {
if (bool.equals(target)) {
return true;
}
if (bool && "true".equals(target)) {
return true;
}
return false;
return bool.equals(target) || String.valueOf(bool).equals(target);
}
public static boolean compare(Date date, Object target) {
if (date == target) {
return true;

4
hsweb-core/src/test/java/org/hswebframework/web/bean/DiffTest.java
View File

@@ -15,13 +15,15 @@ public class DiffTest {
Map<String, Object> before = new HashMap<>();
before.put("name", "name");
before.put("age",21);
before.put("bool",true);
before.put("bool", true);
before.put("bool", false);
before.put("birthday", DateFormatter.fromString("19910101"));
Map<String, Object> after = new HashMap<>();
after.put("name", "name");
after.put("age", "21");
after.put("bool", "true");
after.put("bool", "false");
after.put("birthday", "1991-01-01");