13.11解决合并冲突

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -6,6 +6,7 @@ using System.Security.Claims;
 using StackExchange.Redis;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.RedisRepository;
+using OASystem.Infrastructure.Repositories.System;
 
 namespace OASystem.API.Controllers
 {
@@ -19,7 +20,10 @@ namespace OASystem.API.Controllers
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
         private readonly UsersRepository _usersRepository;
-        //private IDatabase _redis;
+        private readonly SetDataRepository _setDataRepository;
+        private readonly SystemMenuPermissionRepository _SystemMenuPermissionRepository;
+        private readonly CompanyRepository _CompanyRepository;
+        //private IDatabase _redis; 
         //private RedisHelper _redisHelper;
         public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper, 
             SetDataRepository setDataRepository, CompanyRepository companyRepository, 
@@ -28,6 +32,9 @@ namespace OASystem.API.Controllers
             _config = config;
             _loginRep = loginRep;
             _mapper = mapper;
+            _setDataRepository = setDataRepository;
+            _CompanyRepository = companyRepository;
+            _SystemMenuPermissionRepository = systemMenuPermissionRepository;
             //_usersRepository = usersRepository;
         }
 

OASystem/OASystem.Domain/ViewModels/System/DepartmentView.cs

@@ -7,12 +7,12 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.System
 {
-    public class DepartmentView
+    public class DepartmentIView
     {
         /// <summary>
         /// id
         /// </summary>
-        public int id { get; set; }
+        public int Id { get; set; }
 
         /// <summary>
         /// 公司Id

OASystem/OASystem.Domain/ViewModels/System/UserInfoView.cs

@@ -121,50 +121,51 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public int DepId { get; set; }
 
-    /// <summary>
-    /// 用户信息 - 个人基本信息
-    /// </summary>
-    public class UserBasicInfoView 
-    {
-        /// <summary>
-        /// 用户Id
-        /// </summary>
-        public string DepName { get; set; }
-
-        /// <summary>
-        /// 岗位Id
-        /// </summary>
-        public int JobPostId { get; set; }
-        /// <summary>
-        /// 性别
-        /// 0 男1 女  2 未设置
-        /// </summary>
-
-        public int Sex { get; set; }
-
         /// <summary>
-        /// 工号
-        /// </summary>
-        public string Number { get; set; }
-
-        /// <summary>
-        /// 公司名称
-        /// </summary>
-        public string CompanyName { get; set; }
-
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string DepName { get; set; }
-
-        /// <summary>
-        /// 岗位名称
-        /// </summary>
-        public string JobName { get; set; }
-
-        /// <summary>
-        /// 邮箱
-        /// </summary>
-        public string Email { get; set; }
+        /// 用户信息 - 个人基本信息
+        /// </summary>
+        public class UserBasicInfoView
+        {
+            /// <summary>
+            /// 用户Id
+            /// </summary>
+            public string id { get; set; }
+
+            /// <summary>
+            /// 岗位Id
+            /// </summary>
+            public int JobPostId { get; set; }
+            /// <summary>
+            /// 性别
+            /// 0 男1 女  2 未设置
+            /// </summary>
+
+            public int Sex { get; set; }
+
+            /// <summary>
+            /// 工号
+            /// </summary>
+            public string Number { get; set; }
+
+            /// <summary>
+            /// 公司名称
+            /// </summary>
+            public string CompanyName { get; set; }
+
+            /// <summary>
+            /// 部门名称
+            /// </summary>
+            public string DepName { get; set; }
+
+            /// <summary>
+            /// 岗位名称
+            /// </summary>
+            public string JobName { get; set; }
+
+            /// <summary>
+            /// 邮箱
+            /// </summary>
+            public string Email { get; set; }
+        }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/DepartmentRepository.cs

@@ -9,20 +9,6 @@ namespace OASystem.Infrastructure.Repositories.System
         public DepartmentRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {
         }
-
-
-        public Result QueryDepListByCompId(DepartmentRepository _DepartmentRepository,int companyid)
-        {
-            Result result = new Result();
-            var DBdata =  _DepartmentRepository.QueryDto<Sys_Department, DepartmentView>(x => x.CompanyId == companyid);
-            if (DBdata != null && DBdata.Count() > 0)
-            {
-                result.Code = 0;
-                result.Msg = "成功！";
-                result.Data = DBdata;
-            }
-
-            return result;
-        }
+        
     }
 }