部分代码修改

OASystem/OASystem.Infrastructure/Repositories/CRM/NewClientDataRepository.cs

@@ -2,6 +2,7 @@
 using AutoMapper.Execution;
 using MySqlX.XDevAPI.Relational;
 using NPOI.OpenXmlFormats.Dml.Diagram;
+using NPOI.SS.Formula.Functions;
 using OASystem.Domain;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.CRM;
@@ -196,6 +197,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 int state = 0;
 
                 #region 负责人
+                if (dto.OperationUserId != 21)
+                {
+                    dto.Userid = dto.OperationUserId.ToString();
+                }
+
                 if (!string.IsNullOrWhiteSpace(dto.Userid))
                 {
                     string sql = string.Format(@"select u1.UsersId as UserId,u2.CnName,u1.NewClientDataId from Crm_ClientDataAndUser u1,Sys_Users u2 where u1.UsersId=u2.Id and u1.UsersId in ({0})  and u1.IsDel = 0", dto.Userid);
@@ -394,6 +400,74 @@ namespace OASystem.Infrastructure.Repositories.CRM
                     }
                 }
 
+                #region 下拉框初始化数据
+                //负责人下拉框
+                List<dynamic> _Users = new List<dynamic>();
+                List<Sys_Users> users = GetNewExistClient();
+                foreach (Sys_Users user in users)
+                {
+                    var data = new
+                    {
+                        Id = user.Id,
+                        Name = user.CnName
+                    };
+                    _Users.Add(data);
+                };
+                //省域数据
+                List<dynamic> _Province = new List<dynamic>();
+                List<Sys_SetData> province = _sqlSugar.Queryable<Sys_SetData>()
+                .Where(u => u.STid == 42 && u.IsDel == 0).ToList();
+                foreach (Sys_SetData item in province)
+                {
+                    var data = new
+                    {
+                        Id = item.Id,
+                        Name = item.Name
+                    };
+                    _Province.Add(data);
+                };
+                //客户级别数据
+                List<dynamic> _level = new List<dynamic>();
+                List<Sys_SetData> level = _sqlSugar.Queryable<Sys_SetData>()
+                .Where(u => u.STid == 33 && u.IsDel == 0).ToList();
+                foreach (Sys_SetData item in level)
+                {
+                    var data = new
+                    {
+                        Id = item.Id,
+                        Name = item.Name
+                    };
+                    _level.Add(data);
+                };
+                //客户类别
+                List<dynamic> _CustomerClass = new List<dynamic>();
+                List<Sys_SetData> CustomerClass = _sqlSugar.Queryable<Sys_SetData>()
+                .Where(u => u.STid == 37 && u.IsDel == 0).ToList();
+                foreach (Sys_SetData item in CustomerClass)
+                {
+                    var data = new
+                    {
+                        Id = item.Id,
+                        Name = item.Name
+                    };
+                    _CustomerClass.Add(data);
+                };
+                //业务分类 
+                List<dynamic> _ServiceClass = new List<dynamic>();
+                List<Sys_SetData> ServiceClass = _sqlSugar.Queryable<Sys_SetData>()
+                .Where(u => u.STid == 36 && u.IsDel == 0).ToList();
+                foreach (Sys_SetData item in ServiceClass)
+                {
+                    var data = new
+                    {
+                        Id = item.Id,
+                        Name = item.Name
+                    };
+                    _ServiceClass.Add(data);
+                };
+                #endregion
+                var groupNumber = await QueryNumberGroups();
+
                 if (NewClientDataView.Count > 0)
                 {
                     int count = NewClientDataView[0].countPage;
@@ -403,74 +477,6 @@ namespace OASystem.Infrastructure.Repositories.CRM
 
                     if (dto.PortType == 1)
                     {
-                        #region 下拉框初始化数据
-                        //负责人下拉框
-                        List<dynamic> _Users = new List<dynamic>();
-                        List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>()
-                        .Where(u => u.IsDel == 0).ToList();
-                        foreach (Sys_Users user in users)
-                        {
-                            var data = new
-                            {
-                                Id = user.Id,
-                                Name = user.CnName
-                            };
-                            _Users.Add(data);
-                        };
-                        //省域数据
-                        List<dynamic> _Province = new List<dynamic>();
-                        List<Sys_SetData> province = _sqlSugar.Queryable<Sys_SetData>()
-                        .Where(u => u.STid == 42 && u.IsDel == 0).ToList();
-                        foreach (Sys_SetData item in province)
-                        {
-                            var data = new
-                            {
-                                Id = item.Id,
-                                Name = item.Name
-                            };
-                            _Province.Add(data);
-                        };
-                        //客户级别数据
-                        List<dynamic> _level = new List<dynamic>();
-                        List<Sys_SetData> level = _sqlSugar.Queryable<Sys_SetData>()
-                        .Where(u => u.STid == 33 && u.IsDel == 0).ToList();
-                        foreach (Sys_SetData item in level)
-                        {
-                            var data = new
-                            {
-                                Id = item.Id,
-                                Name = item.Name
-                            };
-                            _level.Add(data);
-                        };
-                        //客户类别
-                        List<dynamic> _CustomerClass = new List<dynamic>();
-                        List<Sys_SetData> CustomerClass = _sqlSugar.Queryable<Sys_SetData>()
-                        .Where(u => u.STid == 37 && u.IsDel == 0).ToList();
-                        foreach (Sys_SetData item in CustomerClass)
-                        {
-                            var data = new
-                            {
-                                Id = item.Id,
-                                Name = item.Name
-                            };
-                            _CustomerClass.Add(data);
-                        };
-                        //业务分类 
-                        List<dynamic> _ServiceClass = new List<dynamic>();
-                        List<Sys_SetData> ServiceClass = _sqlSugar.Queryable<Sys_SetData>()
-                        .Where(u => u.STid == 36 && u.IsDel == 0).ToList();
-                        foreach (Sys_SetData item in ServiceClass)
-                        {
-                            var data = new
-                            {
-                                Id = item.Id,
-                                Name = item.Name
-                            };
-                            _ServiceClass.Add(data);
-                        };
-                        #endregion
-
                         foreach (var item in NewClientDataView)
                         {
                             List<AscribedUser> AscribedUser = await _sqlSugar.SqlQueryable<AscribedUser>
@@ -481,9 +487,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                           ("select  d2.Id,d2.Name,d1.NewClientDataId  from Crm_ClientDataAndBusiness d1,Sys_SetData d2 where d1.SetDataId=d2.Id and NewClientDataId=" + item.Id + "  AND d1.ISDEL = 0").ToListAsync();
                             item.AscribedDepartment = AscribedDepartment;
                         }
-
-                        var groupNumber = await QueryNumberGroups();
-
+                        
                         var Data = new
                         {
                             ClientTableData = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
@@ -532,7 +536,17 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 }
                 else
                 {
-                    result = new Result() { Code = -1, Msg = "暂无数据！" };
+                    var Data = new
+                    {
+                        ClientTableData = new { pageCount = 0, totalPage = 0, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = NewClientDataView },
+                        Users = _Users,
+                        Province = _Province,
+                        level = _level,
+                        CustomerClass = _CustomerClass,
+                        ServiceClass = _ServiceClass,
+                        groupNumber = groupNumber.Data,
+                    };
+                    result = new Result() { Code = 0, Msg = "获取成功！",Data = Data };
                 }
 
             }
@@ -958,5 +972,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
 
             return AcrionResult;
         }
+
+        public List<Sys_Users> GetNewExistClient()
+        {
+            string sql = "SELECT  * FROM  Sys_Users su  where su.id in (\r\n\t select distinct usersid from Crm_ClientDataAndUser WHERE  IsDel  = 0 \r\n) \r\n";
+            return _sqlSugar.SqlQueryable<Sys_Users>(sql).ToList();
+        }
     }
 }