修改getCompanyList查询公司，QueryDepartmentList查询部门方法，修改公司、部门返回view

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1,10 +1,6 @@
 
-using MySqlX.XDevAPI.Common;
-using OASystem.Domain.Dtos.System;
-using OASystem.Domain.Entities.System;
-using OASystem.Domain.ViewModels.System;
-using OASystem.Infrastructure.Repositories.Login;
-using OASystem.Infrastructure.Repositories.System;
+
+
 
 namespace OASystem.API.Controllers
 {
@@ -57,19 +53,31 @@ namespace OASystem.API.Controllers
         #region 企业操作
         [HttpGet]
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> getCompanyList()
+        public async Task<IActionResult> getCompanyList(DtoBase dto)
         {
             try
             {
-                //var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(c=>c.IsDel!=null).ToList();
-                string sqlWhere = "select * from Sys_Company";
-                var companyList = _syscomRep.GetListBySqlWithNolock(sqlWhere);
-                List<CompanyView> DataList = _mapper.Map<List<CompanyView>>(companyList);
-                if (DataList.Count == 0)
+                if (dto.PortType == 1)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else if (dto.PortType == 2)
+                {
+                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyIView>(a=>a.ToBool(true)).ToList();
+                    if (companyList.Count == 0)
+                    {
+                        return Ok(JsonView(false, "暂无数据！"));
+                    }
+                    return Ok(JsonView(companyList));
+                }
+                else if (dto.PortType == 3)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else
                 {
                     return Ok(JsonView(false, "暂无数据！"));
                 }
-                return Ok(JsonView(DataList));
             }
             catch (Exception ex)
             {
@@ -89,12 +97,27 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                var result = _sysDepRep.QueryDto<Sys_Department, DepartmentView>(s => s.CompanyId == dto.CompanyId).ToList();
-                if (result.Count==0)
+                if (dto.PortType==1)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else if (dto.PortType==2)
+                {
+                    var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
+                    if (result.Count == 0)
+                    {
+                        return Ok(JsonView(false, "暂无数据！"));
+                    }
+                    return Ok(JsonView(result));
+                }
+                else if (dto.PortType == 3)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else
                 {
                     return Ok(JsonView(false, "暂无数据！"));
                 }
-                return Ok(JsonView(result));
             }
             catch (Exception ex)
             {

OASystem/OASystem.Api/GlobalUsings.cs

@@ -47,6 +47,9 @@ global using System;
 global using System.Collections.Generic;
 global using System.Linq;
 global using OASystem.Domain;
-
+global using OASystem.Domain.Dtos.System;
+global using OASystem.Domain.Entities.System;
+global using OASystem.Domain.ViewModels.System;
+global using OASystem.Infrastructure.Repositories.System;
 
 

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -17,12 +17,11 @@ namespace OASystem.Domain.AutoMappers
             #endregion
 
             #region 公司板块
-            CreateMap<Sys_Company, CompanyView>();
+            CreateMap<Sys_Company, CompanyIView>();
             #endregion
 
             #region 部门板块
-            CreateMap<DepartmentDto, Sys_Department>();
-            CreateMap<Sys_Department, DepartmentView>();
+            CreateMap<Sys_Department, DepartmentIView>();
             #endregion
 
             #region 用户板块

OASystem/OASystem.Domain/Dtos/System/DepartmentDto.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Dtos.System
 {
-    public class DepartmentDto
+    public class DepartmentDto:DtoBase
     {
         /// <summary>
         /// 公司Id

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -8,10 +8,17 @@ using System.Threading.Tasks;
 namespace OASystem.Domain.ViewModels
 {
     /// <summary>
-    /// 公司视图表（返回数据model）
+    /// 公司视图表（返回数据model）安卓端
     /// </summary>
-    public class CompanyView:Sys_Company
+    public class CompanyIView
     {
-        
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
     }
 }

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

@@ -7,8 +7,15 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.System
 {
-    public class DepartmentView:Sys_Department
+    public class DepartmentIView
     {
-       
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepName { get; set; }
     }
 }

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

@@ -14,16 +14,21 @@ namespace OASystem.Domain.ViewModels.System
     /// </summary>
     public class UserIView
     {
+
         /// <summary>
-        /// 公司名称
+        /// 部门Id
         /// </summary>
-        public string CompanyName { get; set; }
 
+        public int DepId { get; set; }
+       
         /// <summary>
         /// 部门名称
         /// </summary>
         public string DepName { get; set; }
-
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int JobPostId { get; set; }
         /// <summary>
         /// 岗位名称
         /// </summary>
@@ -37,43 +42,13 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         
         public string CnName { get; set; }
-        /// <summary>
-        /// 英文姓名
-        /// </summary>
-        
-        public string EnName { get; set; }
+       
         /// <summary>
         /// 工号
         /// </summary>
         
         public string Number { get; set; }
         /// <summary>
-        /// 公司Id
-        /// </summary>
-       
-        public int CompanyId { get; set; }
-        /// <summary>
-        /// 部门Id
-        /// </summary>
-        
-        public int DepId { get; set; }
-        /// <summary>
-        /// 岗位Id
-        /// </summary>
-        
-        public int JobPostId { get; set; }
-        
-        /// <summary>
-        /// 性别0 男1 女  2 未设置
-        /// </summary>
-        
-        public int Sex { get; set; }
-        /// <summary>
-        /// 分机号
-        /// </summary>
-        
-        public string Ext { get; set; }
-        /// <summary>
         /// 手机号
         /// </summary>
         
@@ -88,34 +63,6 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         
         public string Email { get; set; }
-        /// <summary>
-        /// 住址
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
-        public string Address { get; set; }
-        /// <summary>
-        /// 入职时间
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime Edate { get; set; }
-        /// <summary>
-        /// 离职时间
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime Rdate { get; set; }
-        
-       
-        /// <summary>
-        /// 身份证号码
-        /// </summary>
-        public string IDCard { get; set; }
-        
-        
-        /// <summary>
-        /// 家庭地址
-        /// </summary>
-        public string HomeAddress { get; set; }
-        
     }
 
     /// <summary>

OASystem/OASystem.Infrastructure/GlobalUsings.cs

@@ -10,3 +10,4 @@ global using System.Text.Json;
 global using Microsoft.AspNetCore.Http;
 global using System.Text.RegularExpressions;
 global using OASystem.Domain.Entities.System;
+global using OASystem.Domain.ViewModels.System;

OASystem/OASystem.Infrastructure/Repositories/System/CompanyRepository.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class CompanyRepository : BaseRepository<Sys_Company, CompanyView>
+    public class CompanyRepository : BaseRepository<Sys_Company, CompanyIView>
     {
         public CompanyRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {

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

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class DepartmentRepository : BaseRepository<Sys_Department, DepartmentView>
+    public class DepartmentRepository : BaseRepository<Sys_Department, DepartmentIView>
     {
         public DepartmentRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {

OASystem/OASystem.Infrastructure/Repositories/System/UsersRepository.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class UsersRepository : BaseRepository<UserInfoView, JsonView>
+    public class UsersRepository : BaseRepository<UserInfoView, UserIView>
     {
         private readonly IMapper _mapper;
         public UsersRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
@@ -36,7 +36,6 @@ namespace OASystem.Infrastructure.Repositories.System
             if (portType == 1) //web
             {
                 List<UserIWebView> _userWebList = _mapper.Map<List<UserIWebView>>(_userList);
-
                 if (_userList.Count != 0)
                 {
                     result.Code = 0;