商邀资料查询 QueryInvitationOfficialActivityData

团组查询条件更改

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1391,18 +1391,17 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 List<Res_InvitationOfficialActivityData> _ioaDatas = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().Where(it => it.IsDel == 0).ToList();
                 List<Sys_Users> _Users = _sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0).ToList();
 
-                var _countryData = _ioaDatas.Select(it => it.Country).Distinct().ToList();
-                _countryData.Remove("");
-                var _inviterData = _ioaDatas.Select(it => it.UnitName).Distinct().ToList();
-                _inviterData.Remove("");
-                var _contactData = _ioaDatas.Select(it => it.Contact).Distinct().ToList();
-                _contactData.Remove("");
-                var _groupNameData = _DelegationInfos.Select(it => new { it.Id,it.TeamName }).ToList();
+                var _countryData = _ioaDatas.Select(it => it.Country).Distinct().ToList(); _countryData.Remove("");
+                var _inviterData = _ioaDatas.Select(it => it.UnitName).Distinct().ToList(); _inviterData.Remove("");
+                var _contactData = _ioaDatas.Select(it => it.Contact).Distinct().ToList(); _contactData.Remove("");
+                var _domainData = _ioaDatas.Select(it => it.Field).Distinct().ToList(); _domainData.Remove("");
+                var _groupNameData = _DelegationInfos.Select(it => new { it.Id, it.TeamName }).ToList();
                 var _userNameData = _Users.Select(it => new { it.Id, it.CnName }).ToList();
 
                 var _data = new {
                     CountryData = _countryData,
-                    inviterData = _inviterData,
+                    InviterData = _inviterData,
+                    DomainData = _domainData,
                     ContactData = _contactData,
                     GroupNameData = _groupNameData,
                     UserNameData = _userNameData,
@@ -1439,7 +1438,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 if (!string.IsNullOrWhiteSpace(dto.Country)) { sqlWhere += string.Format(@" And i.Country like '%{0}%'", dto.Country); }
                 if (!string.IsNullOrWhiteSpace(dto.UnitName)) { sqlWhere += string.Format(@" And i.UnitName like '%{0}%'", dto.UnitName); }
                 if (!string.IsNullOrWhiteSpace(dto.Contact)) { sqlWhere += string.Format(@" And i.Contact like '%{0}%'", dto.Contact); }
-                if (!string.IsNullOrWhiteSpace(dto.Delegation)) { sqlWhere += string.Format(@" And ','+i.Delegation+',' like '%,{0},%'", dto.Delegation); }
+                if (!string.IsNullOrWhiteSpace(dto.Delegation)) { sqlWhere += string.Format(@" And i.Delegation like '%{0}%'", dto.Delegation); }
                 if (!string.IsNullOrWhiteSpace(dto.Field)) { sqlWhere += string.Format(@" And i.Field like '%{0}%'", dto.Field); }
 
                 if (dto.CreateUserId != 0 && !string.IsNullOrWhiteSpace(dto.CreateUserId.ToString())) { sqlWhere += string.Format(@" And i.CreateUserId={0}", dto.CreateUserId); }
@@ -1447,7 +1446,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 {
                     sqlWhere += string.Format(@" And i.CreateTime between '{0}' and '{1}'", dto.StartCreateTime, dto.EndCreateTime);
                 }
-                sqlWhere += string.Format(@"And Isdel={0}", 0);
+                sqlWhere += string.Format(@"And i.Isdel={0}", 0);
 
                 if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                 {