测试解决冲突

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -79,12 +79,13 @@ namespace OASystem.API.Controllers
                 }
                 else if (dto.PortType == 2)
                 {
-                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(a=>a.IsDel!=null).ToList();
-                    if (companyList.Count == 0)
+                    var CompanyDataResult = _CompanyRepository.GetCompanyData();
+                    if (CompanyDataResult.Code != 0)
                     {
-                        return Ok(JsonView(false, "暂无数据！"));
+                        return Ok(JsonView(CompanyDataResult.Msg));
                     }
-                    return Ok(JsonView(true,"查询成功！",companyList));
+                    
+                    return Ok(JsonView(true,"查询成功！", CompanyDataResult.Data));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -493,7 +494,7 @@ namespace OASystem.API.Controllers
             }
 
             //公司数据
-            var CompanyDataResult = _CompanyRepository.GetCompanyData(_CompanyRepository);
+            var CompanyDataResult = _CompanyRepository.GetCompanyData();
             if (CompanyDataResult.Code != 0)
             {
                 return Ok(JsonView(CompanyDataResult.Msg));

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -10,7 +10,7 @@ namespace OASystem.Domain.ViewModels
         /// <summary>
         /// 公司id
         /// </summary>
-        public int id { get; set; }
+        public int Id { get; set; }
         /// <summary>
         /// 公司Code
         /// </summary>

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

@@ -129,7 +129,7 @@ namespace OASystem.Domain.ViewModels.System
             /// <summary>
             /// 用户Id
             /// </summary>
-            public string id { get; set; }
+            public string Id { get; set; }
 
             /// <summary>
             /// 岗位Id

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

@@ -15,12 +15,12 @@ namespace OASystem.Infrastructure.Repositories.System
         /// </summary>
         /// <param name="_CompanyRepository"></param>
         /// <returns></returns>
-        public Result GetCompanyData(CompanyRepository _CompanyRepository)
+        public Result GetCompanyData()
         {
             Result result = new Result();
 
             string sql = "select * from Sys_Company where isdel = 0";
-            var DBdata =  _CompanyRepository.GetListBySqlWithNolock(sql);
+            var DBdata =  GetListBySqlWithNolock(sql);
             if (DBdata == null || DBdata.Count == 0)
             {
                 result.Code = -1;
@@ -34,7 +34,7 @@ namespace OASystem.Infrastructure.Repositories.System
             {
                 CompanyCode = x.CompanyCode,
                 CompanyName = x.CompanyName,
-                id = x.Id,
+                Id = x.Id,
                 ParentCompanyId = x.ParentCompanyId
             });
             return result;