干系人去重

ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs

@@ -462,7 +462,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
          
         var queryData1 = TenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(c => c.Status == StatusEnum.Enable.ToEnumInt()).Where(exp.ToExpression());
          
-        var queryData0 = TenantDb.UnionAll(queryData, queryData1); 
+        var queryData0 = TenantDb.UnionAll(queryData, queryData1).Distinct(); 
 
         var query = queryData0//.Where(c => c.Status == StatusEnum.Enable.ToEnumInt())//TenantDb.Queryable<InfoClient>()
             .LeftJoin<InfoClientContact>((c, c1) => c.Id == c1.ClientId)

ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs

@@ -228,7 +228,7 @@ public class ClientCommonService : IClientCommonService
 
         var queryData1 = tenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(c => c.Status == StatusEnum.Enable.ToEnumInt()).Where(exp.ToExpression());
 
-        var queryData0 = tenantDb.UnionAll(queryData, queryData1);
+        var queryData0 = tenantDb.UnionAll(queryData, queryData1).Distinct();
         //code = code.ToLower();
         var data = await queryData0
             .InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
@@ -1312,7 +1312,7 @@ public class ClientCommonService : IClientCommonService
 
         var queryData1 = tenantDb.Queryable<InfoClient>().ClearFilter<ISharedOrgId>().Where(c => c.Status == StatusEnum.Enable.ToEnumInt()).Where(exp.ToExpression());
 
-        var queryData0 = tenantDb.UnionAll(queryData, queryData1);
+        var queryData0 = tenantDb.UnionAll(queryData, queryData1).Distinct();
         //code = code.ToLower();
         var data = await queryData0//tenantDb.Queryable<InfoClient>()//.Where(a=> tenantDb.Ado.SqlQuery<dynamic>(sql, new SugarParameter($"@ClientId", a.Id)).Contains(user.UserId))
             .InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)