From 131e0332e0b64ade6eab5b84632d27f0bb7ddaff Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 30 May 2018 22:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=8A=A0=E5=AF=862=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/sys/db/InitCoreData.java | 1 - .../src/test/java/com/jeesite/test/DaoMapperTest.java | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index d065a96c..0ea722fc 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -257,7 +257,6 @@ public class InitCoreData extends BaseInitDataTests { if("save".equals(action)){ User entity = (User)params[1]; entity.setIsNewRecord(true); - entity.setPassword(UserService.encryptPassword(entity.getPassword())); userService.save(entity); return null; } diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java index 9de40a54..820b73c6 100644 --- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java +++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java @@ -149,7 +149,14 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println(new Config("1").getSqlMap().getWhere() .andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2) .or("name", QueryType.EQ, "ghi", 3).endBracket().toSql()); - + System.out.println(new Config().getSqlMap().getWhere() + .andBracket("name", QueryType.EQ, "val", 1) + .and("name", QueryType.NE, "val", 2).endBracket() + .orBracket("name", QueryType.NE, "val", 3) + .and("name", QueryType.NE, "val", 4).endBracket() + .orBracket("name", QueryType.NE, "val", 5) + .and("name", QueryType.EQ, "val", 6).endBracket().toSql()); + System.out.println("============ 带括号空值测试 ============"); System.out.println(new Config("1").getSqlMap().getWhere() .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2) @@ -173,6 +180,7 @@ public class DaoMapperTest extends BaseSpringContextTests { company.getArea().setCreateDate_gte(new Date()); company.getArea().setCreateDate_lte(new Date()); System.out.println(company.getSqlMap().getWhere().toSql()); + } }