From 9dce1301278ce37d7c4381a44cfa51b70e656b80 Mon Sep 17 00:00:00 2001
From: sunkaixuna <610262374@qq.com>
Date: Mon, 10 Jan 2022 19:33:22 +0800
Subject: [PATCH] Update mapper

---
 .../SqlServerTest/UnitTest/UQueryable.cs      | 36 +++++++++----------
 .../QueryableProvider/QueryableProvider.cs    |  6 +++-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable.cs
index a7eda5c65..1a4751b24 100644
--- a/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable.cs
+++ b/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable.cs
@@ -245,24 +245,24 @@ namespace OrmTest
                 UserType = 1
             };
             db.Insertable(data).ExecuteCommand();
-            var role = new SqlSugarDemo.RoleEntity()
-            {
-                 RoleId=Guid.NewGuid(),
-                   ManageAccount= Guid.NewGuid(),
-                  ManageOrg=Guid.NewGuid(),
-                   OrganizationId=Guid.NewGuid(),
-                    UnitPrice=1,
-                     Quantity=1,
-                      RoleName="",
-                       RoleType=1,
-                        SortNum=1
-            };
-            db.Insertable(role).ExecuteCommand();
-            db.Insertable(new SqlSugarDemo.UserRoleEntity()
-            {
-                 RoleId= role.RoleId,
-                 UserId=data.UserId
-            }).ExecuteCommand();
+            //var role = new SqlSugarDemo.RoleEntity()
+            //{
+            //     RoleId=Guid.NewGuid(),
+            //       ManageAccount= Guid.NewGuid(),
+            //      ManageOrg=Guid.NewGuid(),
+            //       OrganizationId=Guid.NewGuid(),
+            //        UnitPrice=1,
+            //         Quantity=1,
+            //          RoleName="",
+            //           RoleType=1,
+            //            SortNum=1
+            //};
+            //db.Insertable(role).ExecuteCommand();
+            //db.Insertable(new SqlSugarDemo.UserRoleEntity()
+            //{
+            //     RoleId= role.RoleId,
+            //     UserId=data.UserId
+            //}).ExecuteCommand();
             var d111111111111 = db.Queryable<SqlSugarDemo.UserEntity>()
               .Mapper<SqlSugarDemo.UserEntity, SqlSugarDemo.RoleEntity, SqlSugarDemo.UserRoleEntity>(it => ManyToMany.Config(it.UserId, it.RoleId)).InSingle(data.UserId);
         }
diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index ade33df4f..154d795a7 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -243,7 +243,11 @@ namespace SqlSugar
                                                    FieldValue=string.Join(",",mappingList.Select(z=>UtilMethods.GetPropertyValue(z,m_bPropertyName)).Distinct())
                                                   }
                    };
-                   var bList = this.Context.Queryable<BType>().Where(cons).ToList();
+                   List<BType> bList = new List<BType>();
+                   if (mappingList.Any())
+                   {
+                       bList=this.Context.Queryable<BType>().Where(cons).ToList();
+                   }
 
                    //get result
                    Dictionary<object, List<BType>> result = new Dictionary<object, List<BType>>();