diff --git a/diboot-core-starter/pom.xml b/diboot-core-starter/pom.xml
index 031b43fd97840835d30a88e9f91cb7b93bd47317..019de01788e24df1d8a63f12841e009f2b0d4f60 100644
--- a/diboot-core-starter/pom.xml
+++ b/diboot-core-starter/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>diboot-core-spring-boot-starter</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
     <packaging>jar</packaging>
     <description>diboot core starter project</description>
 
@@ -57,6 +57,11 @@
             <scope>test</scope>
         </dependency>
         <!--
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.5</version>
+        </dependency>
         <dependency>
             <groupId>com.dm</groupId>
             <artifactId>DmJdbcDriver18</artifactId>
diff --git a/diboot-core-starter/src/main/java/com/diboot/core/starter/RedisAutoConfig.java b/diboot-core-starter/src/main/java/com/diboot/core/starter/RedisAutoConfig.java
index 055868addb8e6907921978a750b83cc437beffdc..82d4fb364e508528efa133621421b12fa1743016 100644
--- a/diboot-core-starter/src/main/java/com/diboot/core/starter/RedisAutoConfig.java
+++ b/diboot-core-starter/src/main/java/com/diboot/core/starter/RedisAutoConfig.java
@@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -48,7 +48,7 @@ public class RedisAutoConfig {
 
     @Bean
     @ConditionalOnMissingBean
-    public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory connectionFactory) {
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
         //... 初始化RedisTemplate
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
index 882f63f2b2d5717764cbd063bea4b5e405635234..a33a54780eec252cbab35e4278dac66a0ed6dba2 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/dto/DepartmentDTO.java
@@ -74,6 +74,7 @@ public class DepartmentDTO implements Serializable {
 
     @BindQuery(comparison = Comparison.LIKE)
     @TableField("`character`")
+    //@TableField
     private String character;
 
     public Date getCreateTimeEnd(){
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
index d8da8cac63d60db4323100c503264af94009c576..f75aa7d42cf867e9e4662ddb61a96f8710041efc 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Department.java
@@ -56,6 +56,7 @@ public class Department extends BaseEntity {
     private String name;
 
     @TableField("`character`")
+    //@TableField
     private String character;
 
     /**
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Region.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Region.java
new file mode 100644
index 0000000000000000000000000000000000000000..e38e1b637ab9a65ca099b96e54c45061f202b0e3
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/Region.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015-2021, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diboot.core.entity.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 地区
+ * @author wangyl@dibo.ltd
+ * @version v2.0
+ * @date 2021/08/27
+ */
+@Getter @Setter @Accessors(chain = true)
+public class Region extends BaseEntity {
+    private static final long serialVersionUID = -8236836229460084181L;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 层级
+     */
+    private Integer level;
+
+    /**
+     * 名称
+     */
+    private String code;
+
+    /**
+     * 父级id
+     */
+    private Long parentId;
+
+    /**
+     * 子节点
+     */
+    @TableField(exist = false)
+    private List<Region> children;
+}
\ No newline at end of file
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
index f18957329667c0168b902011549a1972d0bc7267..cfc2577cba00c8cb655fd1e253cfe0fbe47abb60 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/entity/User.java
@@ -16,6 +16,7 @@
 package diboot.core.test.binder.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.diboot.core.data.copy.Accept;
 import com.diboot.core.entity.BaseEntity;
 import com.diboot.core.util.D;
@@ -35,7 +36,7 @@ import java.util.Date;
 @Getter
 @Setter
 @Accessors(chain = true)
-//@TableName("\"USER\"")
+//@TableName("\"user\"")
 public class User extends BaseEntity {
     private static final long serialVersionUID = 3050761344045195972L;
 
@@ -56,5 +57,6 @@ public class User extends BaseEntity {
     private LocalDateTime localDatetime;
 
     @TableField("`character`")
+    //@TableField
     private String character;
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/RegionMapper.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/RegionMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..ef2185c36b38dc4f8e8647677e116560e35e18af
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/mapper/RegionMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.mapper;
+
+import com.diboot.core.mapper.BaseCrudMapper;
+import diboot.core.test.binder.entity.Region;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Region Mapper
+ * @author mazc@dibo.ltd
+ * @version 2018/12/22
+ */
+@Mapper
+public interface RegionMapper extends BaseCrudMapper<Region> {
+
+}
+
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/RegionService.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/RegionService.java
new file mode 100644
index 0000000000000000000000000000000000000000..da2d5cf4d15afeec14dd3b53975e80b01056e0f9
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/RegionService.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.service;
+
+import com.diboot.core.service.BaseService;
+import diboot.core.test.binder.entity.Region;
+
+/**
+ * region相关Service
+ * @author mazc@dibo.ltd
+ * @version v2.0
+ * @date 2019/1/5
+ */
+public interface RegionService extends BaseService<Region> {
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/RegionServiceImpl.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/RegionServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..df1cff17d6475c37651ada53399e25e0c8747a8d
--- /dev/null
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/service/impl/RegionServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015-2020, www.dibo.ltd (service@dibo.ltd).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package diboot.core.test.binder.service.impl;
+
+import com.diboot.core.service.impl.BaseServiceImpl;
+import diboot.core.test.binder.entity.Region;
+import diboot.core.test.binder.mapper.RegionMapper;
+import diboot.core.test.binder.service.RegionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * region相关Service
+ * @author mazc@dibo.ltd
+ * @version 2018/12/23
+ */
+@Service
+public class RegionServiceImpl extends BaseServiceImpl<RegionMapper, Region> implements RegionService {
+
+}
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
index 9706824ede2e3f045287f9b26c51dbf9d45f2d89..5232c43e981600e933d98cf4c40519fc3c2c6fd7 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/ComplexSplitVO.java
@@ -41,7 +41,7 @@ public class ComplexSplitVO extends Organization {
     // ，拆分的id值绑定 （中间表1-n主键绑定）
     @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=user.id AND user.`character`=uuid",
             splitBy= Cons.SEPARATOR_COMMA)
-//    @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"USER\".id AND \"USER\".character=uuid",
+//    @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"user\".id AND \"user\".character=uuid",
 //            splitBy= Cons.SEPARATOR_COMMA)
     private List<TestUploadFile> managerPhotos;
 
@@ -49,12 +49,12 @@ public class ComplexSplitVO extends Organization {
     @BindFieldList(entity = TestUploadFile.class, field = "fileName",
             condition="this.manager_id=user.id AND user.`character`=uuid", splitBy= Cons.SEPARATOR_COMMA)
 //    @BindFieldList(entity = TestUploadFile.class, field = "fileName",
-//            condition="this.manager_id=\"USER\".id AND \"USER\".character=uuid", splitBy= Cons.SEPARATOR_COMMA)
+//            condition="this.manager_id=\"user\".id AND \"user\".character=uuid", splitBy= Cons.SEPARATOR_COMMA)
     private List<String> managerPhotoNames;
 
     // 中间表1-n非主键绑定
     @BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=user.id AND user.id=rel_obj_id AND rel_obj_type = 'IamUser'")
-    //@BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"USER\".id AND \"USER\".id=rel_obj_id AND rel_obj_type = 'IamUser'")
+    //@BindEntityList(entity = TestUploadFile.class, condition="this.manager_id=\"user\".id AND \"user\".id=rel_obj_id AND rel_obj_type = 'IamUser'")
     private List<TestUploadFile> managerPhotoList;
 
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleUuidSplitVO.java b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleUuidSplitVO.java
index 2ac20f86dd302b4da57920b39311c1aaa27662d6..39fff1872131f92a8e5f5e5fa2d1012587d0871e 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleUuidSplitVO.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/binder/vo/SimpleUuidSplitVO.java
@@ -40,11 +40,12 @@ public class SimpleUuidSplitVO extends User {
 
     // ，拆分的id值绑定
     @BindEntityList(entity = TestUploadFile.class, condition="this.`character`=uuid", splitBy= Cons.SEPARATOR_COMMA)
+    //@BindEntityList(entity = TestUploadFile.class, condition="this.character=uuid", splitBy= Cons.SEPARATOR_COMMA)
     private List<TestUploadFile> photos;
 
     // ，拆分的id值绑定
-    @BindFieldList(entity = TestUploadFile.class, field = "fileName", condition="this.`character`=uuid",
-            splitBy= Cons.SEPARATOR_COMMA)
+    @BindFieldList(entity = TestUploadFile.class, field = "fileName", condition="this.`character`=uuid", splitBy= Cons.SEPARATOR_COMMA)
+    //@BindFieldList(entity = TestUploadFile.class, field = "fileName", condition="this.character=uuid", splitBy= Cons.SEPARATOR_COMMA)
     private List<String> photoNames;
 
 }
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
index e60bb362d8cefda33b1d5d943f2359b49b5fdba5..fa9201e410f083c26cd03e51c611e94160e53fd5 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/query/TestJoinQuery.java
@@ -248,20 +248,28 @@ public class TestJoinQuery {
         // 初始化DTO，测试不涉及关联的情况
         DepartmentDTO dto = new DepartmentDTO();
         dto.setParentId(10001L);
-        dto.setOrgName("苏州");
 
         // 分页
         Pagination pagination = new Pagination();
         pagination.setPageSize(2);
         pagination.setPageIndex(1);
-        // 测试排序
-        pagination.setOrderBy("orgName:DESC,parentName");
+        pagination.setOrderBy("parentId:DESC");
 
+        // 测试排序
         // 验证 转换后的wrapper可以直接查询
         QueryWrapper<DepartmentDTO> queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(dto, pagination);
         // 第二页 1条结果
         List<Department> departments = departmentService.getEntityList(queryWrapper, pagination);
         Assert.assertTrue(departments.size() == pagination.getPageSize());
+
+        dto.setOrgName("苏州");
+        pagination.setOrderBy("orgName:DESC,parentName");
+
+        // 验证 转换后的wrapper可以直接查询
+        queryWrapper = QueryBuilder.toDynamicJoinQueryWrapper(dto, pagination);
+        // 第二页 1条结果
+        departments = departmentService.getEntityList(queryWrapper, pagination);
+        Assert.assertTrue(departments.size() == pagination.getPageSize());
     }
 
     @Test
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
index e94bb7e7de5af8385982eea7ec9ac9ddab1f2e0a..fdfaf05eedae9a4fe176c8be8a064dba7bc8e34e 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/service/BaseServiceTest.java
@@ -497,7 +497,7 @@ public class BaseServiceTest {
             sqls.add("SET IDENTITY_INSERT dictionary ON");
         }
         sqls.add("INSERT INTO dictionary(id, parent_id, type, item_name) VALUES("+dictId+", 0, 'TEST', '')");
-        sqls.add("DELETE FROM dictionary WHERE id=20000 AND is_deleted=1");
+        sqls.add("DELETE FROM dictionary WHERE id=20000 AND is_deleted!="+BaseConfig.getActiveFlagValue());
         boolean success = SqlFileInitializer.executeMultipleUpdateSqlsWithTransaction(sqls);
         Assert.assertTrue(success);
         Dictionary dict = dictionaryService.getEntity(dictId);
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
index c4fda8cf6d5f3a9ca360d65a12a8385699aaaf51..9ec83dc47039eca4d58c0c73d82ee84eb122d149 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/BeanUtilsTest.java
@@ -28,9 +28,11 @@ import com.diboot.core.util.V;
 import com.diboot.core.vo.DictionaryVO;
 import com.sun.management.OperatingSystemMXBean;
 import diboot.core.test.StartupApplication;
+import diboot.core.test.binder.entity.Region;
 import diboot.core.test.binder.entity.TestRegion;
 import diboot.core.test.binder.entity.TestUploadFile;
 import diboot.core.test.binder.entity.User;
+import diboot.core.test.binder.service.RegionService;
 import diboot.core.test.config.SpringMvcConfig;
 import org.junit.Assert;
 import org.junit.Test;
@@ -61,6 +63,9 @@ public class BeanUtilsTest {
     @Autowired
     private DictionaryService dictionaryService;
 
+    @Autowired
+    private RegionService regionService;
+
     @Test
     public void testFields(){
         List<Field> fields = BindingCacheManager.getFields(Dictionary.class);
@@ -231,7 +236,7 @@ public class BeanUtilsTest {
         Assert.assertEquals(list.get(0).getChildren().size(), 5);
 
         list = BeanUtils.convertList(dictionaryList, DictionaryVO.class);
-        list = BeanUtils.buildTree(list, 0, Cons.FieldName.id.name());
+        list = BeanUtils.buildTree(list, 0l, Cons.FieldName.id.name());
         Assert.assertEquals(list.size(), 1);
         Assert.assertEquals(list.get(0).getChildren().size(), 5);
 
@@ -298,6 +303,19 @@ public class BeanUtilsTest {
         }
     }
 
+    /**
+     * 测试buildTree性能
+     */
+    @Test
+    public void testBuildTreePerformance() {
+        List<Region> regions = regionService.getEntityList(null);
+        long begin = System.currentTimeMillis();
+        List<Region> topLevel = BeanUtils.buildTree(regions);
+        Assert.assertTrue(topLevel.size() > 30 && topLevel.size() < 40);
+        long end = System.currentTimeMillis();
+        System.out.println( (end - begin) + "ms");
+    }
+
     @Test
     public void testSetProperty(){
         TestUploadFile object = new TestUploadFile();
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
index 9d96bb8cc38cc01a7e8a16b1fc7304b87d5dd379..d0fc286debd81e5f827534de1946305529151227 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/ContextHelperTest.java
@@ -43,7 +43,7 @@ public class ContextHelperTest {
     @Test
     public void testDatabaseType(){
         String dbType = ContextHelper.getDatabaseType();
-        Assert.assertTrue(dbType.equals("mysql") || dbType.equals("dm"));
+        Assert.assertTrue(dbType.equals("mysql") || dbType.equals("dm") || dbType.equals("postgresql"));
 
         BaseService baseService = ContextHelper.getBaseServiceByEntity(DemoTest.class);
         Assert.assertTrue(BeanUtils.getTargetClass(baseService).getName().equals(DemoTestServiceImpl.class.getName()));
diff --git a/diboot-core-starter/src/test/java/diboot/core/test/util/DTest.java b/diboot-core-starter/src/test/java/diboot/core/test/util/DTest.java
index fcb8ef88e1f640ec83dc2886495fbde06b00bc93..f8cc408cb76163fc8bb5f022adee71386ba6192e 100644
--- a/diboot-core-starter/src/test/java/diboot/core/test/util/DTest.java
+++ b/diboot-core-starter/src/test/java/diboot/core/test/util/DTest.java
@@ -38,6 +38,7 @@ public class DTest {
                 "2019-06-02 13:35",
                 "2019-06-02 13:35:09",
                 "2019-06-02 13:35:02:000",
+                "2019-06-02T13:35:02:000",
                 "2019年6月2日 13:35:00",
                 "2019/6/2 13:35:34:000"
         };
diff --git a/diboot-core-starter/src/test/resources/application.properties b/diboot-core-starter/src/test/resources/application.properties
index 6adc59da6124eea815d0ae02f5117a37a1dd719d..4551eda412440bb4914006e21980583cef490a70 100644
--- a/diboot-core-starter/src/test/resources/application.properties
+++ b/diboot-core-starter/src/test/resources/application.properties
@@ -1,19 +1,25 @@
 server.port=8080
 server.servlet.context-path=/api
 
+spring.datasource.hikari.maximum-pool-size=5
+
 # Mysql datasource config
 spring.datasource.url=jdbc:mysql://localhost:3306/playground?characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=diboot
 spring.datasource.password=123456
-spring.datasource.hikari.maximum-pool-size=5
 
 # DM datasource config
 #spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
 #spring.datasource.url=jdbc:dm://localhost:3652?schema=DIBOOT_PLAYGROUND&characterEncoding=utf8&serverTimezone=GMT%2B8
 #spring.datasource.username=SYSDBA
 #spring.datasource.password=123456
-#spring.datasource.hikari.maximum-pool-size=5
+
+# PG datasource config
+#spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?currentSchema=public
+#spring.datasource.username=postgres
+#spring.datasource.password=123456
+#spring.datasource.hikari.driver-class-name=org.postgresql.Driver
 
 spring.main.allow-bean-definition-overriding=true
 
@@ -21,6 +27,9 @@ mybatis-plus.global-config.mapper-locations=classpath*:mapper/*Mapper.xml
 mybatis-plus.global-config.db-config.logic-delete-value=1
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
 
+#mybatis-plus.global-config.db-config.logic-delete-value=true
+#mybatis-plus.global-config.db-config.logic-not-delete-value=false
+
 logging.level.root=DEBUG
 logging.level.org.apache=info
 logging.level.org.hibernate.validator=info
diff --git a/diboot-core-starter/src/test/resources/unittest-mysql.sql b/diboot-core-starter/src/test/resources/unittest-mysql.sql
index fefb62f770313ffed6cf16b5763b4d4415015727..9a9e0a809b48d97eec82358df400b1344368063e 100644
--- a/diboot-core-starter/src/test/resources/unittest-mysql.sql
+++ b/diboot-core-starter/src/test/resources/unittest-mysql.sql
@@ -31,21 +31,18 @@ create table department
     `character` varchar(100) null comment '关键字',
     is_deleted tinyint(1) default 0 not null comment '已删除',
     create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间'
-)
-    comment '部门' charset=utf8mb4;
+) comment '部门' charset=utf8mb4;
 
 create table organization
 (
-    id int auto_increment comment 'ID'
-        primary key,
+    id int auto_increment comment 'ID' primary key,
     parent_id int default 0 not null comment '上级单位ID',
     name varchar(100) not null comment '名称',
     telphone varchar(20) null comment '电话',
     manager_id bigint not null comment '负责人id',
     is_deleted tinyint(1) default 0 not null comment '是否有效',
     create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间'
-)
-    comment '单位' charset=utf8mb4;
+) comment '单位' charset=utf8mb4;
 
 create table role
 (
@@ -91,7 +88,7 @@ CREATE TABLE `db_goods_goods_info` (
                                        `create_ts` datetime default CURRENT_TIMESTAMP null,
                                        `update_ts`  datetime null,
                                        `is_del` tinyint DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) comment '商品信息' CHARSET=utf8;
 
 CREATE TABLE `db_purchase_rel_plan_goods` (
                                               `rel_id` bigint DEFAULT NULL,
@@ -100,7 +97,7 @@ CREATE TABLE `db_purchase_rel_plan_goods` (
                                               `create_ts` datetime default CURRENT_TIMESTAMP null,
                                               `update_ts`  datetime null,
                                               `is_del` tinyint DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) comment 'purchase_rel_plan_goods' CHARSET=utf8;
 
 CREATE TABLE `db_purchase_form_plan` (
                                          `purchase_form_plan_id` bigint DEFAULT NULL,
@@ -108,7 +105,7 @@ CREATE TABLE `db_purchase_form_plan` (
                                          `is_del` tinyint DEFAULT '0',
                                          `create_ts` datetime default CURRENT_TIMESTAMP null,
                                          `update_ts`  datetime null
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) comment 'purchase_form_plan' CHARSET=utf8;
 
 -- 上传文件表
 CREATE TABLE test_upload_file (
@@ -122,7 +119,7 @@ CREATE TABLE test_upload_file (
                                   file_type varchar(20) DEFAULT NULL COMMENT '文件类型',
                                   is_deleted   tinyint(1)  default 0                 not null comment '是否删除',
                                   create_time  datetime   default CURRENT_TIMESTAMP not null comment '创建时间'
-) DEFAULT CHARSET=utf8 COMMENT='测试uuid';
+) comment '测试uuid';
 
 -- playground.demo_test definition
 
@@ -143,7 +140,7 @@ CREATE TABLE `demo_test` (
                              `create_by` bigint DEFAULT '0' COMMENT '创建人',
                              `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                              `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
-) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Demo测试';
+) comment 'Demo测试';
 
 -- playground.demo_test_join definition
 
@@ -154,7 +151,7 @@ CREATE TABLE `demo_test_join` (
                                   `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '邮箱',
                                   `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '删除标记',
                                   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
-) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='关联测试';
+) comment '关联测试';
 
 create table customer
 (
@@ -164,8 +161,20 @@ create table customer
     extjsonarr JSON null comment '扩展json对象',
     is_deleted tinyint(1) default 0 not null comment '已删除',
     create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间'
-)
-    comment '客户' charset=utf8mb4;
+) comment '客户' charset=utf8mb4;
+
+-- playground.region definition
+CREATE TABLE `region` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `name` varchar(20) NOT NULL COMMENT '名称',
+  `code` varchar(20) NOT NULL COMMENT '编码',
+  `parent_id` bigint NOT NULL COMMENT '父级',
+  `level` smallint NOT NULL DEFAULT '0' COMMENT '层级',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '删除标记',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='行政区划';
 
 INSERT INTO customer (id, realname, cellphone, extjsonarr)
 VALUES (10001, '张三', '13800001111', '["WEBSOCKET","EMAIL"]'), (10002, '李四', '13800002222', '["TEXT_MESSAGE"]');
diff --git a/diboot-core-starter/src/test/resources/unittest-pg.sql b/diboot-core-starter/src/test/resources/unittest-pg.sql
new file mode 100644
index 0000000000000000000000000000000000000000..5efec94515c77f6620bc4333a77ea8bd74616b3d
--- /dev/null
+++ b/diboot-core-starter/src/test/resources/unittest-pg.sql
@@ -0,0 +1,214 @@
+-- 建表
+CREATE TABLE dictionary (
+    id bigserial not null,
+    parent_id bigint NOT NULL,
+    tenant_id bigint NOT NULL DEFAULT 0,
+    app_module varchar(50) null,
+    type varchar(50) NOT NULL,
+    item_name varchar(100) NOT NULL,
+    item_value varchar(100) DEFAULT NULL,
+    description varchar(100) DEFAULT NULL,
+    extdata varchar(200) DEFAULT NULL,
+    sort_id smallint NOT NULL DEFAULT '99',
+    is_editable BOOLEAN NOT NULL DEFAULT TRUE,
+    is_deletable BOOLEAN NOT NULL DEFAULT FALSE,
+    is_deleted BOOLEAN NOT NULL DEFAULT FALSE,
+    create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    constraint PK_dictionary primary key (id)
+);
+
+
+create table department
+(
+    id bigint not null,
+    parent_id bigint default 0 not null,
+    org_id bigint not null,
+    name varchar(50) not null,
+    extdata varchar(100) null,
+    extjsonarr JSON null,
+    extjsonobj JSON null,
+    character varchar(100) null,
+    is_deleted BOOLEAN default FALSE not null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
+    constraint PK_department primary key (id)
+);
+
+create table organization
+(
+    id int not null,
+    parent_id int default 0 not null,
+    name varchar(100) not null,
+    telphone varchar(20) null,
+    manager_id bigint not null,
+    is_deleted BOOLEAN default FALSE not null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
+    constraint PK_organization primary key (id)
+);
+
+create table role
+(
+    id int not null,
+    name varchar(20) null,
+    code varchar(20) null,
+    is_deleted BOOLEAN default FALSE null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP null,
+    constraint PK_role primary key (id)
+);
+
+create table "user"
+(
+    id int not null,
+    department_id int default 0 not null,
+    username varchar(20) null,
+    gender varchar(20) null,
+    birthdate date null,
+    character varchar(100) null,
+    is_deleted BOOLEAN default FALSE null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP null,
+    local_datetime TIMESTAMP null,
+    constraint PK_user primary key (id)
+);
+
+create table user_role
+(
+    user_type varchar(20) not null,
+    user_id int not null,
+    role_id int not null,
+    primary key (user_id, role_id)
+);
+
+create table cc_city_info
+(
+    id int not null,
+    parent_id int null,
+    region_id int not null,
+    region_name varchar(100) null,
+    constraint PK_cc_city_info primary key (id)
+);
+
+CREATE TABLE db_goods_goods_info (
+     goods_id bigint DEFAULT NULL,
+     goods_nm varchar(10) DEFAULT NULL,
+     create_ts TIMESTAMP default CURRENT_TIMESTAMP null,
+     update_ts TIMESTAMP null,
+     is_del BOOLEAN DEFAULT false,
+     constraint PK_db_goods_goods_info primary key (goods_id)
+);
+
+CREATE TABLE db_purchase_rel_plan_goods (
+    rel_id bigint DEFAULT NULL,
+    purchase_form_plan_id bigint DEFAULT NULL,
+    goods_id bigint DEFAULT NULL,
+    create_ts TIMESTAMP default CURRENT_TIMESTAMP null,
+    update_ts TIMESTAMP null,
+    is_del BOOLEAN default false,
+    constraint PK_db_purchase_rel_plan_goods primary key (rel_id)
+);
+
+CREATE TABLE db_purchase_form_plan (
+   purchase_form_plan_id bigint DEFAULT NULL,
+   name varchar(100) DEFAULT NULL,
+   is_del BOOLEAN default false,
+   create_ts TIMESTAMP default CURRENT_TIMESTAMP null,
+   update_ts TIMESTAMP null,
+   constraint PK_db_purchase_form_plan primary key (purchase_form_plan_id)
+);
+
+-- 上传文件表
+CREATE TABLE test_upload_file (
+      uuid varchar(32) NOT NULL,
+      rel_obj_type varchar(50) DEFAULT NULL,
+      rel_obj_id varchar(32) DEFAULT NULL,
+      rel_obj_field varchar(50) DEFAULT NULL,
+      file_name varchar(100) NOT NULL,
+      storage_path varchar(200) NOT NULL,
+      access_url varchar(200) NULL,
+      file_type varchar(20) DEFAULT NULL,
+      is_deleted BOOLEAN default FALSE not null,
+      create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
+      constraint PK_test_upload_file primary key (uuid)
+);
+
+-- playground.demo_test definition
+
+CREATE TABLE demo_test (
+   id bigserial not null,
+   is_deleted BOOLEAN NOT NULL DEFAULT FALSE,
+   name varchar(100) NOT NULL,
+   age bigint NOT NULL,
+   id_card varchar(100) DEFAULT NULL,
+   mobile_phone varchar(100) DEFAULT NULL,
+   email varchar(100) DEFAULT NULL,
+   sex varchar(100) DEFAULT NULL,
+   birthday date DEFAULT NULL,
+   sss_img varchar(200) DEFAULT NULL,
+   mmm_img varchar(1000) DEFAULT NULL,
+   data_file varchar(1000) DEFAULT NULL,
+   file_test varchar(200) DEFAULT NULL,
+   create_by bigint DEFAULT '0',
+   create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+   update_time TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+   constraint PK_demo_test primary key (id)
+);
+
+-- playground.demo_test_join definition
+
+CREATE TABLE demo_test_join (
+    id bigserial not null,
+    demo_test_id bigint DEFAULT NULL,
+    name varchar(100) DEFAULT NULL,
+    email varchar(100) DEFAULT NULL,
+    is_deleted BOOLEAN NOT NULL DEFAULT FALSE,
+    create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    constraint PK_demo_test_join primary key (id)
+);
+
+create table customer
+(
+    id bigint not null,
+    realname varchar(50) not null,
+    cellphone varchar(50) not null,
+    extjsonarr JSON null,
+    is_deleted BOOLEAN default FALSE not null,
+    create_time TIMESTAMP default CURRENT_TIMESTAMP not null,
+    constraint PK_customer primary key (id)
+);
+
+INSERT INTO customer (id, realname, cellphone, extjsonarr)
+VALUES (10001, '张三', '13800001111', '["WEBSOCKET","EMAIL"]'), (10002, '李四', '13800002222', '["TEXT_MESSAGE"]');
+
+-- 初始化样例数据
+INSERT INTO department (id, parent_id, org_id, name, character, extjsonobj, extjsonarr)
+VALUES (10001, 0, 100001, '产品部', 'WW', null, null), (10002, 10001, 100001, '研发组', '1001', null, null),
+       (10003, 10001, 100001, '测试组', '[1001,1002]', '{"id": 1001, "name": "TEST"}', '[1001,1002]'), (10004, 10001, 100001, '市场部', '1001,1002', '{"id": 1001, "name": "TEST"}', '[1001,1002]'),
+       (10005, 10003, 100001, '自动化测试', null, null, null), (10006, 10003, 100001, '功能测试', null, null, null);
+INSERT INTO dictionary (id, parent_id, app_module, type, item_name, item_value) VALUES (1, 0, '', 'GENDER', '性别', null), (2, 1, '', 'GENDER', '男', 'M'), (3, 1, '', 'GENDER', '女', 'F');
+INSERT INTO dictionary
+(id, parent_id, tenant_id, app_module, type, item_name, item_value, description, extdata, sort_id, is_editable, is_deletable)
+VALUES(10050, 0, 0, NULL, 'MESSAGE_CHANNEL', '发送通道', NULL, 'message发送通道', NULL, 99, true, true),
+      (10051, 10050, 0, NULL, 'MESSAGE_CHANNEL', '站内信', 'WEBSOCKET', NULL, NULL, 0, true, true),
+      (10052, 10050, 0, NULL, 'MESSAGE_CHANNEL', '短信', 'TEXT_MESSAGE', NULL, NULL, 1, true, true),
+      (10053, 10050, 0, NULL, 'MESSAGE_CHANNEL', '邮件', 'EMAIL', NULL, NULL, 2, true, true);
+INSERT INTO organization (id, parent_id, name, telphone, manager_id) VALUES (100001, 0, '苏州帝博', '0512-62988949', 1001), (100002, 0, '成都帝博', '028-62988949', 1002);
+INSERT INTO role (id, name, code) VALUES (101, '管理员', 'ADMIN'), (102, '操作员', 'OPERATOR');
+INSERT INTO "user" (id, department_id, username, gender, character) VALUES (1001, 10002, '张三', 'M', 'test123456'), (1002, 10002, '李四', 'F', 'test123456,test234567'), (1003, 10001, '王五', 'M', 'WW');
+INSERT INTO user_role (user_type, user_id, role_id) VALUES ('SysUser', 1001, 101),('SysUser', 1001, 102),('OrgUser', 1002, 102);
+INSERT INTO cc_city_info (id, parent_id, region_id, region_name) VALUES (10000, 0, 10000, '江苏省'), (10010, 10000, 10010, '苏州市'), (10020, 10010, 10020, '园区');
+INSERT INTO db_goods_goods_info (goods_id, goods_nm, is_del) VALUES(1001, 'abcde', false), (1002, 'abcd', false);
+INSERT INTO db_purchase_rel_plan_goods(rel_id, purchase_form_plan_id, goods_id, is_del)VALUES(1, 1, 1001, false), (2, 1, 1002, false);
+INSERT INTO db_purchase_form_plan(purchase_form_plan_id, name, is_del)VALUES(1, '5月份采购计划', false);
+INSERT INTO test_upload_file(uuid, rel_obj_type, rel_obj_id, file_name, access_url, storage_path)
+values ('test123456', 'IamUser', 1001, '123456.jpg', 'http://www.baidu.com', '/temp'),
+       ('test234567', 'IamUser', 1001, '234567.jpg', 'http://www.baidu.com', '/temp');
+
+INSERT INTO demo_test
+(id, is_deleted, name, age, id_card, mobile_phone, email, sex, birthday, sss_img, mmm_img, data_file, file_test, create_by)
+VALUES(10000074, false, '666', 666, 'kdt3kHX4lAEshODwXMaqAg==', 'dI7AKyanaPYiWL0c5CfuPQ==', 'kdt3kHX4lAEshODwXMaqAg==', NULL, NULL, NULL, NULL, NULL, NULL, 0),
+      (10000075, false, '1', 111, 'kBzIU3XgeowKFQnyeGZfZZHbd5B1+JQBLITg8FzGqgI=', 'AYdMZnNVJwYmpHh8VmC11A==', '5tEbe9Q9hti2Z0spAE5fsA==', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
+INSERT INTO demo_test_join (id, demo_test_id, name, email)
+VALUES(10000081, 10000074, '111', 'L9vrF7wJBKbbLRZChI33WA=='),
+      (10000084, 10000074, '114', 'A2Y6CZ4tv0V7QxPbq9EYkg=='),
+      (10000089, 10000075, '119', 'VVnnuR7fXzsIHCMilEsgLw=='),
+      (10000091, 10000075, '112', 'BqAefnSadfixkCebXakUDg=='),
+      (10000093, 10000075, '114', 'A2Y6CZ4tv0V7QxPbq9EYkg==');
diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
index 660937a2150293eb061fdb0b79fbbdc605b2bd5d..56127eff9ee831780ecc346be57b5483d3fcfa3d 100644
--- a/diboot-core/pom.xml
+++ b/diboot-core/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>diboot-core</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
     <packaging>jar</packaging>
     <description>diboot core project</description>
 
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
index 3a5da0d0f82abd3faa333ca1f0218917802845a5..ea410e41d981380a990f2a54eaf69976c17c591c 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/JoinsBinder.java
@@ -146,7 +146,7 @@ public class JoinsBinder {
             Map<String, Object> fieldValueMap = new HashMap<>();
             // 格式化map
             for(Map.Entry<String, Object> entry : colValueMap.entrySet()){
-                if(entry.getKey().startsWith(DynamicSqlProvider.PLACEHOLDER_COLUMN_FLAG)) {
+                if(entry.getKey().endsWith(DynamicSqlProvider.PLACEHOLDER_COLUMN_FLAG)) {
                     log.debug("忽略查询占位字段 {}", entry.getKey());
                     continue;
                 }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
index 68539b5f7878804d73d606c802e08907dd782a9b..8c5f9cef07c1c3adf06c6004a9dd7798b46f5fb0 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/BaseBinder.java
@@ -81,11 +81,11 @@ public abstract class BaseBinder<T> {
     /**
      * 注解宿主对象列名-字段名的映射map
      */
-    private PropInfo annoObjPropInfo;
+    protected PropInfo annoObjPropInfo;
     /**
      * 被关联对象列名-字段名的映射map
      */
-    private PropInfo refObjPropInfo;
+    protected PropInfo refObjPropInfo;
 
     public static final String NOT_SUPPORT_MSG = "中间表关联暂不支持涉及目标表多列的情况!";
 
@@ -317,7 +317,8 @@ public abstract class BaseBinder<T> {
             // 构建查询条件
             if (V.notEmpty(annoObjectJoinOnList)) {
                 String refObjJoinOnCol = refObjJoinCols.get(i);
-                List<?> unpackAnnoObjectJoinOnList = ResultAssembler.unpackValueList(annoObjectJoinOnList, this.splitBy);
+                Class<?> fieldType = refObjPropInfo.getFieldTypeByColumn(refObjJoinOnCol);
+                List<?> unpackAnnoObjectJoinOnList = ResultAssembler.unpackValueList(annoObjectJoinOnList, this.splitBy, fieldType);
                 queryWrapper.in(refObjJoinOnCol, unpackAnnoObjectJoinOnList);
                 if (remoteBindDTO != null) {
                     remoteBindDTO.setRefJoinCol(refObjJoinOnCol).setInConditionValues(unpackAnnoObjectJoinOnList);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
index 0057f25b5a840d82ef435b5d54cf5075f3e1f792..ffdc6c8debc2907b71a049de54c6f9bf1e4d93da 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/EntityListBinder.java
@@ -108,7 +108,8 @@ public class EntityListBinder<T> extends EntityBinder<T> {
             // 收集查询结果values集合
             List entityIdList = extractIdValueFromMap(middleTableResultMap);
             if(V.notEmpty(this.splitBy)){
-                entityIdList = ResultAssembler.unpackValueList(entityIdList, this.splitBy);
+                Class<?> fieldType = refObjPropInfo.getFieldTypeByColumn(refObjJoinCols.get(0));
+                entityIdList = ResultAssembler.unpackValueList(entityIdList, this.splitBy, fieldType);
             }
             //处理orderBy，附加排序
             this.appendOrderBy(remoteBindDTO);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
index bf092498569782317d7120d3df3c941088578b68..231c0a8d112372ee21efa7d658143805b87659d5 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/binder/FieldListBinder.java
@@ -112,7 +112,8 @@ public class FieldListBinder<T> extends FieldBinder<T> {
             // 收集查询结果values集合
             List entityIdList = extractIdValueFromMap(middleTableResultMap);
             if(V.notEmpty(this.splitBy)){
-                entityIdList = ResultAssembler.unpackValueList(entityIdList, this.splitBy);
+                Class<?> fieldType = refObjPropInfo.getFieldTypeByColumn(refObjJoinCols.get(0));
+                entityIdList = ResultAssembler.unpackValueList(entityIdList, this.splitBy, fieldType);
             }
             // 构建查询条件
             String refObjJoinOnCol = refObjJoinCols.get(0);
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
index 3b127981b16a70fb888e1da82128d53705cf60f5..33810210de0c4ee436bd39c6a0e53861c570cedc 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/helper/ResultAssembler.java
@@ -346,33 +346,46 @@ public class ResultAssembler {
      * @param splitBy
      * @return
      */
-    public static List unpackValueList(List valueList, String splitBy) {
+    public static List unpackValueList(List valueList, String splitBy, Class<?> fieldType) {
+        if(V.isEmpty(valueList)) {
+            return valueList;
+        }
         List newValueList = new ArrayList();
-        valueList.forEach( value -> {
-            if(value != null){
-                if(value instanceof Collection) {
-                    for(Object key : (Collection)value){
-                        String oneVal = S.valueOf(key);
-                        if(!newValueList.contains(oneVal)){
-                            newValueList.add(oneVal);
-                        }
+        for(Object value : valueList) {
+            if(value == null) {
+                continue;
+            }
+            if(value instanceof Collection) {
+                for(Object key : (Collection)value){
+                    if(!newValueList.contains(key)){
+                        newValueList.add(key);
                     }
                 }
-                else {
+            }
+            else {
+                if(V.notEmpty(splitBy)){
+                    boolean isSameType = fieldType == null || fieldType.equals(String.class);
                     String valueStr = S.clearNonConst(S.valueOf(value));
-                    if(V.notEmpty(splitBy) && valueStr.contains(splitBy)){
+                    if(valueStr.contains(splitBy)) {
                         for(String oneVal : valueStr.split(splitBy)){
-                            if(!newValueList.contains(oneVal)){
-                                newValueList.add(oneVal);
+                            Object oneValueObj = isSameType? oneVal : BeanUtils.convertValueToFieldType(oneVal, fieldType);
+                            if(!newValueList.contains(oneValueObj)){
+                                newValueList.add(oneValueObj);
                             }
                         }
                     }
-                    else if(!newValueList.contains(valueStr)){
-                        newValueList.add(valueStr);
+                    else {
+                        Object oneValueObj = isSameType? value : BeanUtils.convertValueToFieldType(value, fieldType);
+                        if(!newValueList.contains(oneValueObj)){
+                            newValueList.add(oneValueObj);
+                        }
                     }
                 }
+                else if(!newValueList.contains(value)){
+                    newValueList.add(value);
+                }
             }
-        });
+        }
         return newValueList;
     }
 
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/MiddleTable.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/MiddleTable.java
index f66ea7e6a32884c287309aee484c4a7ab3c197fd..26742a87b450e7935533880310c4155f2a69d727 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/MiddleTable.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/MiddleTable.java
@@ -144,7 +144,7 @@ public class MiddleTable {
                 return ResultAssembler.convertToOneToOneResult(resultSetMapList, trunkObjColMapping, branchObjColMapping);
             }
             catch (Exception e) {
-                log.error("中间表查询异常", e);
+                log.error("中间表查询异常: " + sql, e);
                 return Collections.emptyMap();
             }
         }
@@ -176,7 +176,7 @@ public class MiddleTable {
                 return ResultAssembler.convertToOneToManyResult(resultSetMapList, trunkObjColMapping, branchObjColMapping);
             }
             catch (Exception e) {
-                log.error("中间表查询异常", e);
+                log.error("中间表查询异常: " + sql, e);
                 return Collections.emptyMap();
             }
         }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
index 4044e125c3ba9656d82e6c8f75a8f08ee24646b9..a11b4ee8b2722dc059b37329635272a2dd5ca753 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/parser/PropInfo.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.diboot.core.config.BaseConfig;
+import com.diboot.core.entity.BaseEntity;
 import com.diboot.core.util.BeanUtils;
 import com.diboot.core.util.S;
 import com.diboot.core.util.V;
@@ -107,7 +108,12 @@ public class PropInfo implements Serializable {
                         columnName = S.toSnakeCase(fldName);
                     }
                     this.idColumn = columnName;
-                    this.idFieldType = fld.getType();
+                    if(beanClass.isAssignableFrom(BaseEntity.class)) {
+                        this.idFieldType = Long.class;
+                    }
+                    else {
+                        this.idFieldType = fld.getType();
+                    }
                 }
                 else{
                     TableLogic tableLogic = fld.getAnnotation(TableLogic.class);
@@ -128,7 +134,12 @@ public class PropInfo implements Serializable {
                 this.fieldToColumnMap.put(fldName, columnName);
                 if(V.notEmpty(columnName)){
                     this.columnToFieldMap.put(columnName, fldName);
-                    this.columnToFieldTypeMap.put(columnName, fld.getType());
+                    if(this.idColumn != null && columnName.equals(this.idColumn) && beanClass.isAssignableFrom(BaseEntity.class)) {
+                        this.columnToFieldTypeMap.put(columnName, Long.class);
+                    }
+                    else {
+                        this.columnToFieldTypeMap.put(columnName, fld.getType());
+                    }
                     this.columns.add(columnName);
                 }
             }
diff --git a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
index 1f84d0aabf1a2c8e56b78ade6ecdd525aed715dd..eb17688f1410b31ff04f4c29e1c948206812e10d 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/query/dynamic/DynamicSqlProvider.java
@@ -150,7 +150,7 @@ public class DynamicSqlProvider {
      * @return
      */
     private String formatSqlSelect(String sqlSelect, Page<?> page){
-        Set<String> columnSets = new HashSet<>();
+        Set<String> columnSets = null;
         StringBuilder sb = new StringBuilder();
         if(V.isEmpty(sqlSelect)){
             sb.append("self.*");
@@ -163,15 +163,18 @@ public class DynamicSqlProvider {
                     sb.append(Cons.SEPARATOR_COMMA);
                 }
                 sb.append("self.").append(column);
+                if(columnSets == null) {
+                    columnSets = new HashSet<>();
+                }
                 columnSets.add("self."+column);
             }
         }
         if(page != null && page.orders() != null) {
             for(OrderItem orderItem : page.orders()){
                 if((V.isEmpty(sqlSelect) && !S.startsWith(orderItem.getColumn(), "self."))
-                    || !columnSets.contains(orderItem.getColumn())
+                    || (columnSets != null && !columnSets.contains(orderItem.getColumn()))
                 ){
-                    sb.append(Cons.SEPARATOR_COMMA).append(orderItem.getColumn()).append(" AS ").append(PLACEHOLDER_COLUMN_FLAG).append(S.replace(orderItem.getColumn(), ".", "_"));
+                    sb.append(Cons.SEPARATOR_COMMA).append(orderItem.getColumn()).append(" AS ").append(S.replace(orderItem.getColumn(), ".", "_")).append(PLACEHOLDER_COLUMN_FLAG);
                 }
             }
         }
diff --git a/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java b/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
index 887e845a98430898d20be6d74bf965d4964514fb..86302e212b1db3b18b46169fec82447b32300a9c 100644
--- a/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
+++ b/diboot-core/src/main/java/com/diboot/core/converter/String2BooleanConverter.java
@@ -30,6 +30,6 @@ public class String2BooleanConverter implements Converter<String, Boolean> {
 
     @Override
     public Boolean convert(String source) {
-        return V.isTrue(source);
+        return V.notEmpty(source)? V.isTrue(source) : null;
     }
 }
diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
index 4185e72767b6fca0b1eb37ae5909db725634ad8b..af70d1a259eecd0f1a53c53ee37ef3208119340d 100644
--- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
+++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java
@@ -243,22 +243,34 @@ public class BeanUtils {
         if(value == null){
             return null;
         }
-        Class<?> type = field.getType();
-        if (value.getClass().equals(type)) {
+        return convertValueToFieldType(value, field.getType());
+    }
+
+    /**
+     * 转换为field对应的类型
+     * @param value
+     * @param fieldType
+     * @return
+     */
+    public static Object convertValueToFieldType(Object value, Class<?> fieldType){
+        if(value == null){
+            return null;
+        }
+        if (value.getClass().equals(fieldType)) {
             return value;
         }
         String valueStr = S.valueOf(value);
-        if (fieldConverterMap.containsKey(type)) {
-            return fieldConverterMap.get(type).apply(valueStr);
-        } else if (LocalDate.class.equals(type) || LocalDateTime.class.equals(type)) {
+        if (fieldConverterMap.containsKey(fieldType)) {
+            return fieldConverterMap.get(fieldType).apply(valueStr);
+        } else if (LocalDate.class.equals(fieldType) || LocalDateTime.class.equals(fieldType)) {
             Date dateVal = (value instanceof Date) ? (Date) value : D.fuzzyConvert(valueStr);
             if (dateVal == null) {
                 return null;
             }
             ZonedDateTime zonedDateTime = dateVal.toInstant().atZone(ZoneId.systemDefault());
-            return LocalDateTime.class.equals(type) ? zonedDateTime.toLocalDateTime() : zonedDateTime.toLocalDate();
-        } else if (Serializable.class.isAssignableFrom(type)) {
-            return JSON.parseObject(valueStr, type);
+            return LocalDateTime.class.equals(fieldType) ? zonedDateTime.toLocalDateTime() : zonedDateTime.toLocalDate();
+        } else if (Serializable.class.isAssignableFrom(fieldType)) {
+            return JSON.parseObject(valueStr, fieldType);
         }
         return value;
     }
@@ -443,60 +455,43 @@ public class BeanUtils {
         if(V.isEmpty(allNodes)){
             return null;
         }
+        Map<Object, List<T>> parentId2ListMap = new HashMap<>();
         // 提取所有的top level对象
-        List<T> topLevelModels = new ArrayList();
-        for(T node : allNodes){
+        for (T node : allNodes) {
             Object parentId = getProperty(node, parentIdFieldName);
-            if(parentId == null || V.fuzzyEqual(parentId, rootNodeId)){
-                topLevelModels.add(node);
-            }
             Object nodeId = getProperty(node, idFieldName);
             if(V.equals(nodeId, parentId)){
                 throw new BusinessException(Status.WARN_PERFORMANCE_ISSUE, "parentId关联自身，请检查！" + node.getClass().getSimpleName()+":"+nodeId);
             }
+            parentId2ListMap.computeIfAbsent(parentId, k -> new ArrayList<>()).add(node);
         }
-        if(V.isEmpty(topLevelModels)){
+        List<T> topLevelModels = parentId2ListMap.get(rootNodeId);
+        if (V.isEmpty(topLevelModels)) {
             return Collections.emptyList();
         }
-        // 遍历第一级节点，并挂载 children 子节点
-        for(T node : allNodes) {
-            Object nodeId = getProperty(node, idFieldName);
-            List<T> children = buildTreeChildren(nodeId, allNodes, idFieldName, parentIdFieldName, childrenFieldName);
-            setProperty(node, childrenFieldName, children);
-        }
+        buildTreeChildren(topLevelModels, parentId2ListMap, idFieldName, childrenFieldName);
         return topLevelModels;
     }
 
     /**
      * 递归构建树节点的子节点
-     * @param parentId
-     * @param nodeList
+     *
+     * @param topLevelModels
+     * @param parentId2ListMap
      * @param idFieldName
-     * @param parentIdFieldName 父节点属性名
-     * @param childrenFieldName 子节点集合属性名
-     * @return
+     * @param childrenFieldName
+     * @param <T>
      */
-    public static <T> List<T> buildTreeChildren(Object parentId, List<T> nodeList, String idFieldName, String parentIdFieldName, String childrenFieldName) {
-        List<T> children = null;
-        for(T node : nodeList) {
-            Object nodeParentId = getProperty(node, parentIdFieldName);
-            if(nodeParentId != null && V.equals(nodeParentId, parentId)) {
-                if(children == null){
-                    children = new ArrayList<>();
-                }
-                children.add(node);
-            }
-        }
-        if(children != null){
-            for(T child : children) {
-                Object nodeId = getProperty(child, idFieldName);
-                List<T> childNodeChildren = buildTreeChildren(nodeId, nodeList, idFieldName, parentIdFieldName, childrenFieldName);
-                if(childNodeChildren != null) {
-                    setProperty(child, childrenFieldName, childNodeChildren);
-                }
+    public static <T> void buildTreeChildren(List<T> topLevelModels, Map<Object, List<T>> parentId2ListMap, String idFieldName, String childrenFieldName) {
+        for (T item : topLevelModels) {
+            Object nodeId = getProperty(item, idFieldName);
+            if (!parentId2ListMap.containsKey(nodeId)) {
+                continue;
             }
+            List<T> children = parentId2ListMap.get(nodeId);
+            setProperty(item, childrenFieldName, children);
+            buildTreeChildren(children, parentId2ListMap, idFieldName, childrenFieldName);
         }
-        return children;
     }
 
     /***
diff --git a/diboot-core/src/main/java/com/diboot/core/vo/JsonResult.java b/diboot-core/src/main/java/com/diboot/core/vo/JsonResult.java
index f70ca00dfa5668a354834207dd2e46414184d6a5..2c1c1ad47d8cf95b49bf8413d2fb93cac39b5280 100644
--- a/diboot-core/src/main/java/com/diboot/core/vo/JsonResult.java
+++ b/diboot-core/src/main/java/com/diboot/core/vo/JsonResult.java
@@ -177,6 +177,15 @@ public class JsonResult<T> implements Serializable {
     public T getData() {
         return filterJsonResultData(data);
     }
+    public void setCode(int code) {
+        this.code = code;
+    }
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+    public void setData(T data) {
+        this.data = data;
+    }
 
     /***
      * 绑定分页信息
@@ -280,7 +289,7 @@ public class JsonResult<T> implements Serializable {
     /***
      * 服务不可用
      */
-    public static <T> JsonResult<T> FAIL_FAIL_REQUEST_TIMEOUT(String msg){
+    public static <T> JsonResult<T> FAIL_REQUEST_TIMEOUT(String msg){
         return new JsonResult<T>(Status.FAIL_REQUEST_TIMEOUT).msg(msg);
     }
     /***
diff --git a/diboot-file-starter/pom.xml b/diboot-file-starter/pom.xml
index 78baf45d9acdbee6f94d51fadef8e311190f93c6..92a8d5877d84d1a4cc6387d0c3ff30f7d4a60f5a 100644
--- a/diboot-file-starter/pom.xml
+++ b/diboot-file-starter/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.diboot</groupId>
             <artifactId>diboot-core-spring-boot-starter</artifactId>
-            <version>${diboot.version}</version>
+            <version>2.7.1</version>
         </dependency>
         <!-- 可选依赖 IAM -->
         <dependency>
diff --git a/diboot-iam-starter/pom.xml b/diboot-iam-starter/pom.xml
index 432fcdbf6767d32c2c456d085bb283f23b50182b..a235bf72a85243b2f047ac8d7157806413fb6403 100644
--- a/diboot-iam-starter/pom.xml
+++ b/diboot-iam-starter/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.diboot</groupId>
             <artifactId>diboot-core-spring-boot-starter</artifactId>
-            <version>${diboot.version}</version>
+            <version>2.7.1</version>
         </dependency>
         <!-- 依赖shiro -->
         <dependency>
diff --git a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
index 346381b8fbbcfa0a85b6e907e99bcbb67e5af2ad..8212e5a49066002659edbae2d60ecd7a790a03ba 100644
--- a/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
+++ b/diboot-iam-starter/src/main/java/com/diboot/iam/annotation/process/BindPermissionAspect.java
@@ -21,6 +21,7 @@ import com.diboot.core.vo.Status;
 import com.diboot.iam.annotation.BindPermission;
 import com.diboot.iam.cache.IamCacheManager;
 import com.diboot.iam.config.Cons;
+import com.diboot.iam.entity.BaseLoginUser;
 import com.diboot.iam.exception.PermissionException;
 import com.diboot.iam.starter.IamProperties;
 import com.diboot.iam.util.IamSecurityUtils;
@@ -86,6 +87,9 @@ public class BindPermissionAspect {
             throw new PermissionException(Status.FAIL_INVALID_TOKEN, e);
         }
         catch (Exception e){
+            BaseLoginUser currentUser = IamSecurityUtils.getCurrentUser();
+            String loginUser = currentUser != null? currentUser.getDisplayName() : null;
+            log.warn("用户 {} 无 {} 的访问权限", loginUser, permissionCode);
             throw new PermissionException(Status.FAIL_NO_PERMISSION, e);
         }
     }
diff --git a/diboot-message-starter/pom.xml b/diboot-message-starter/pom.xml
index ea75436d09bb4653df82400422b1e9328be5d2a3..7c9470fa02879bdd05d987fc380b1022684dd5df 100644
--- a/diboot-message-starter/pom.xml
+++ b/diboot-message-starter/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.diboot</groupId>
             <artifactId>diboot-core-spring-boot-starter</artifactId>
-            <version>${diboot.version}</version>
+            <version>2.7.1</version>
         </dependency>
         <!-- 可选依赖 IAM -->
         <dependency>
diff --git a/diboot-scheduler-starter/pom.xml b/diboot-scheduler-starter/pom.xml
index 1e29c893988d1fbafbb7e82279750c0804782d1c..ec97e415598f61c7dad023bb72b29838480da277 100644
--- a/diboot-scheduler-starter/pom.xml
+++ b/diboot-scheduler-starter/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.diboot</groupId>
             <artifactId>diboot-core-spring-boot-starter</artifactId>
-            <version>${diboot.version}</version>
+            <version>2.7.1</version>
         </dependency>
         <!-- 可选依赖 IAM -->
         <dependency>