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()); + } }