市场客户资料部分修改

OASystem/OASystem.Api/Controllers/MarketCustomerResourcesController.cs

@@ -29,12 +29,12 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> MarketCustomerInit(PortDtoBase dto)
+        public async Task<IActionResult> MarketCustomerInit(MarketCustomerInitDto dto)
         {
             JsonView jw = new JsonView();
             try
             {
-                Result resultData = await _clientDataRepository._Init(dto.PortType);
+                Result resultData = await _clientDataRepository._Init(dto);
                 if (resultData.Code == 0)
                 {
                     jw = JsonView(true, "查询成功!", resultData.Data);

OASystem/OASystem.Domain/Dtos/CRM/NewClientDataQueryDto.cs

@@ -217,4 +217,9 @@ namespace OASystem.Domain.Dtos.CRM
         /// </summary>
         public List<int>? UserIdItem { get; set; }
     }
+
+    public class MarketCustomerInitDto : PortDtoBase
+    {
+       public int UserId { get; set;}
+    }
 }

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

@@ -41,10 +41,12 @@ namespace OASystem.Infrastructure.Repositories.CRM
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> _Init(int portType)
+        public async Task<Result> _Init(MarketCustomerInitDto Dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
 
+            var portType = Dto.PortType;
+
             if (portType == 1 || portType == 2 || portType == 3)
             {
                 #region 下拉框初始化数据
@@ -52,11 +54,13 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 //负责人下拉框
                 //List<dynamic> _Users = new List<dynamic>();
 
-                var _Users = _sqlSugar.Queryable<Sys_Users>().Where(x => x.IsDel == 0).Select(x => new
-                {
-                    x.Id,
-                    Name = x.CnName
-                }).ToList();
+                //var _Users = _sqlSugar.Queryable<Sys_Users>().Where(x => x.IsDel == 0).Select(x => new
+                //{
+                //    x.Id,
+                //    Name = x.CnName
+                //}).ToList();
+
+                var _Users = GetNewExistClient(Dto.UserId);
 
                 //List<Sys_Users> users = GetNewExistClient();
                 //foreach (Sys_Users user in users)   
@@ -204,7 +208,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 int state = 0;
 
                 #region 负责人
-                if (dto.OperationUserId != 21)
+                if (dto.OperationUserId != 21 && dto.OperationUserId != 95)
                 {
                     dto.Userid = dto.OperationUserId.ToString();
                 }
@@ -410,7 +414,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 #region 下拉框初始化数据
                 //负责人下拉框
                 List<dynamic> _Users = new List<dynamic>();
-                List<Sys_Users> users = GetNewExistClient();
+                List<Sys_Users> users = GetNewExistClient(dto.OperationUserId);
                 foreach (Sys_Users user in users)
                 {
                     var data = new
@@ -990,10 +994,21 @@ namespace OASystem.Infrastructure.Repositories.CRM
             return AcrionResult;
         }
 
-        public List<Sys_Users> GetNewExistClient()
+        public List<Sys_Users> GetNewExistClient(int userid)
         {
             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();
+            var userArr =  _sqlSugar.SqlQueryable<Sys_Users>(sql).ToList();
+            var dic = new Dictionary<int, int[]>()
+            {
+                { 95, new int []{ 95 , 337 , 302} }
+            };
+
+            if (dic.Keys.Contains(userid))
+            {
+                return userArr.Where(x=> dic[userid].Contains(x.Id)).ToList();
+            }
+
+            return userArr;
         }
     }
 }