From f19f6bb51e415d3dcba4830e6e1c1ca7e66c1aa1 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 3 Aug 2019 22:10:08 +0800
Subject: [PATCH] =?UTF-8?q?DaoMapper=E6=96=B0=E5=A2=9E=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E8=AE=BE=E5=AE=9Acolumns=E5=92=8Cat?=
 =?UTF-8?q?trName=E4=B8=BAthis=E6=97=B6=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/test/java/com/jeesite/test/DaoMapperTest.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 38535c80..f4254b40 100644
--- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
@@ -16,6 +16,7 @@ import com.jeesite.common.entity.DataScope;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.common.tests.BaseSpringContextTests;
+import com.jeesite.modules.file.dao.FileUploadDao;
 import com.jeesite.modules.file.entity.FileUpload;
 import com.jeesite.modules.sys.dao.AreaDao;
 import com.jeesite.modules.sys.dao.CompanyDao;
@@ -47,6 +48,8 @@ public class DaoMapperTest extends BaseSpringContextTests {
 	private CompanyDao companyDao;
 	@Autowired
 	private DictDataDao dictDataDao;
+	@Autowired
+	private FileUploadDao fileUploadDao;
 	
 	@Test
 	public void testTableAnnotation() throws Exception{
@@ -131,6 +134,10 @@ public class DaoMapperTest extends BaseSpringContextTests {
 			company2.getSqlMap().getDataScope().addFilter("dsf",
 					"Company", "a.company_code", DataScope.CTRL_PERMI_HAVE);
 			System.out.println(companyDao.findList(company2));
+
+			System.out.println("============ 联合查询未设定columns和attrName为this时测试 ============");
+			FileUpload fileUpload = new FileUpload();
+			System.out.println(fileUploadDao.findList(fileUpload));
 			
 			System.out.println("============ 树结构基本查询测试 ============");
 			DictData dictData = new DictData();