Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

代码/TVShoppingCallCenter_ZLJ/Controllers/System/RoleInfoController.cs

@@ -19,12 +19,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
     public class RoleInfoController : BaseController
     {
         private readonly ISys_RoleInfoRepository _sys_role_infoRepository;
-        private readonly ISys_UserAccountRepository _sys_user_accountRepository;
 
-        public RoleInfoController(ISys_RoleInfoRepository sys_role_infoRepository, ISys_UserAccountRepository sys_user_accountRepository)
+        public RoleInfoController(ISys_RoleInfoRepository sys_role_infoRepository)
         {
             _sys_role_infoRepository = sys_role_infoRepository;
-            _sys_user_accountRepository = sys_user_accountRepository;
         }
 
         /// <summary>
@@ -47,11 +45,27 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             }
             #endregion
             int recordCount = 0;
-            var list = await _sys_role_infoRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
+            var list = await _sys_role_infoRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount }, "F_CreateOn desc");
             return Success("获取数据成功", list);
         }
 
         /// <summary>
+        /// 获取角色下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getlistdrop")]
+        public async Task<IActionResult> GetListDropAsync()
+        {
+            var list = await _sys_role_infoRepository.GetListALL(x => x.F_State == (int)EnumDelState.Enabled, o => o.F_CreateOn, OrderByType.Desc);
+            var result = list.Select(x => new {
+                x.F_RoleCode,
+                x.F_RoleName,
+                x.F_RoleId
+            });
+            return Success("获取全部数据成功", result);
+        }
+
+        /// <summary>
         /// 获取角色
         /// </summary>
         /// <param name="id">角色id</param>
@@ -62,7 +76,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             if (id <= 0)
                 return Error("参数错误");
 
-            var model = await _sys_role_infoRepository.GetSingle(x => x.F_RoleId == id);
+            var model = await _sys_role_infoRepository.GetSingle(x => x.F_RoleId == id && x.F_State == (int)EnumDelState.Enabled);
             if (model == null)
             {
                 return Error("获取失败");
@@ -117,7 +131,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             if (string.IsNullOrEmpty(input.role_Code))
                 return Error("请输入角色代码");
 
-            var model = await _sys_role_infoRepository.GetSingle(x => x.F_RoleId == input.role_id);
+            var model = await _sys_role_infoRepository.GetSingle(x => x.F_RoleId == input.role_id && x.F_State == (int)EnumDelState.Enabled);
             if (model == null)
                 return Error("操作失败");
             model.F_RoleName = input.role_name;

代码/TVShoppingCallCenter_ZLJ/Controllers/System/SeatGroupController.cs

@@ -37,7 +37,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
 
-            List<IConditionalModel> conModels1 = new List<IConditionalModel>();
             if (!string.IsNullOrEmpty(key))
             {
                 conModels.Add(new ConditionalCollections()
@@ -58,8 +57,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         }
 
         [Authorize]
-        [HttpGet("getlist")]
-        public async Task<IActionResult> GetList(string key)
+        [HttpGet("getlistdrop")]
+        public async Task<IActionResult> GetListDrop(string key)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
@@ -80,8 +79,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             }
             #endregion
             var list = await _sys_seatgroupRepository.GetListALL(conModels, "F_CreateOn desc");
-
-            return Success("根据条件获取数据成功", list);
+            var result = list.Select(x => new {
+                x.F_ZXZID,
+                x.F_ZXZCode,
+                x.F_ZXZName,
+                x.F_ZXAtt
+            });
+            return Success("获取全部数据成功", result);
         }
 
         /// <summary>

代码/TVShoppingCallCenter_ZLJ/Controllers/System/UserAccountController.cs

@@ -19,9 +19,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
     public class UserAccountController : BaseController
     {
         private readonly ISys_UserAccountRepository _sys_useraccountRepository;
-        public UserAccountController(ISys_UserAccountRepository sys_useraccountRepository)
+        private readonly ISys_RoleInfoRepository _sys_role_infoRepository;
+        public UserAccountController(ISys_UserAccountRepository sys_useraccountRepository, ISys_RoleInfoRepository sys_role_infoRepository)
         {
             _sys_useraccountRepository = sys_useraccountRepository;
+            _sys_role_infoRepository = sys_role_infoRepository;
         }
 
         /// <summary>
@@ -57,6 +59,37 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
             return Success("获取成功", list);
         }
 
+        [HttpGet("getlistdrop")]
+        public async Task<IActionResult> GetListDropAsync(string deptid, string roleid,string rolecode)
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 筛选
+            conModels.Add(new ConditionalModel() { FieldName = "F_DeleteFlag", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
+            if (!string.IsNullOrEmpty(deptid))
+                conModels.Add(new ConditionalModel() { FieldName = "F_DeptId", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
+            if (!string.IsNullOrEmpty(roleid))
+                conModels.Add(new ConditionalModel() { FieldName = "F_RoleId", ConditionalType = ConditionalType.Equal, FieldValue = roleid });
+            if(!string.IsNullOrEmpty(rolecode))
+            {
+                var rolemodel=await _sys_role_infoRepository.GetSingle(x => x.F_RoleCode == rolecode && x.F_State == (int)EnumDelState.Enabled);
+                if (rolemodel != null)
+                    conModels.Add(new ConditionalModel() { FieldName = "F_RoleId", ConditionalType = ConditionalType.Equal, FieldValue = rolemodel.F_RoleId.ToString() });
+                else
+                    conModels.Add(new ConditionalModel() { FieldName = "F_RoleId", ConditionalType = ConditionalType.Equal, FieldValue = "-1" });
+            }
+            #endregion
+            var list = await _sys_useraccountRepository.GetListALL(conModels, "F_CreateOn desc");
+            var result = list.Select(x => new {
+                x.F_UserCode,
+                x.F_UserName,
+                x.F_DeptId,
+                x.F_RoleId,
+                x.F_UserId
+            });
+
+            return Success("获取成功", result);
+        }
+
         /// <summary>
         /// 获取用户详情 by id
         /// </summary>
@@ -150,7 +183,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
                 return Error("获取信息失败");
             model.F_UserCode = input.usercode;
             model.F_UserName = input.username;
-            model.F_Password = input.password;
             model.F_SexFlag = input.sexflag;
             model.F_DeptId = input.deptid;
             model.F_ExtensionNumber = input.extensionnumber;