|
@@ -1,5 +1,6 @@
|
|
using AutoMapper;
|
|
using AutoMapper;
|
|
using OASystem.Domain;
|
|
using OASystem.Domain;
|
|
|
|
+using OASystem.Domain.AesEncryption;
|
|
using OASystem.Domain.Entities.System;
|
|
using OASystem.Domain.Entities.System;
|
|
using OASystem.Domain.ViewModels.System;
|
|
using OASystem.Domain.ViewModels.System;
|
|
using SqlSugar;
|
|
using SqlSugar;
|
|
@@ -23,64 +24,20 @@ namespace OASystem.Infrastructure.Repositories.System
|
|
|
|
|
|
public async Task<Result> GetUserList(int portType,string sqlWhere)
|
|
public async Task<Result> GetUserList(int portType,string sqlWhere)
|
|
{
|
|
{
|
|
- Result result = new Result() { Code = -2 };
|
|
+ Result result = new Result() { Code = -2, Msg = "暂无数据!" };
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
- if (portType == 1)
|
|
+ string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
|
|
- {
|
|
+ su.Id UserId,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
|
|
- string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
|
|
|
|
- su.Id UserId,su.CnName,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
|
|
|
|
From Sys_Users su
|
|
From Sys_Users su
|
|
Inner Join Sys_Company sc On su.CompanyId = sc.Id
|
|
Inner Join Sys_Company sc On su.CompanyId = sc.Id
|
|
Inner Join Sys_Department sd On su.DepId = sd.Id
|
|
Inner Join Sys_Department sd On su.DepId = sd.Id
|
|
Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id Where su.IsDel = 0");
|
|
Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id Where su.IsDel = 0");
|
|
- var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
|
|
+ var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
|
|
|
|
|
|
- if (_userList.Count != 0)
|
|
+ if (portType == 1 || portType == 2 || portType == 3)
|
|
- {
|
|
|
|
- result.Code = 0;
|
|
|
|
- result.Msg = "成功!";
|
|
|
|
- result.Data = _userList;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- result.Msg = "暂无数据!";
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else if (portType == 2)
|
|
|
|
{
|
|
{
|
|
- string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
|
|
+
|
|
- su.Id UserId,su.CnName,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
|
|
+ foreach (var user in _userList) EncryptionProcessor.DecryptProperties(user);
|
|
- From Sys_Users su
|
|
|
|
- Inner Join Sys_Company sc On su.CompanyId = sc.Id
|
|
|
|
- Inner Join Sys_Department sd On su.DepId = sd.Id
|
|
|
|
- Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id ");
|
|
|
|
-
|
|
|
|
- var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
|
|
|
|
|
|
|
|
if (_userList.Count != 0)
|
|
if (_userList.Count != 0)
|
|
{
|
|
{
|
|
@@ -88,19 +45,7 @@ namespace OASystem.Infrastructure.Repositories.System
|
|
result.Msg = "成功!";
|
|
result.Msg = "成功!";
|
|
result.Data = _userList;
|
|
result.Data = _userList;
|
|
}
|
|
}
|
|
- else
|
|
|
|
- {
|
|
|
|
- result.Msg = "暂无数据!";
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else if (portType == 3)
|
|
|
|
- {
|
|
|
|
}
|
|
}
|
|
- else
|
|
|
|
- {
|
|
|
|
- result.Msg = "暂无数据!";
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|