wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:2c421b05d03d20a935c9d84a1c93f747374f49d0
Branches Tags
wyw:master
..
compare: wyw:8cb9df8e4724d6b8398073b8ef1dd449b73afef0
Branches Tags
wyw:master

No commits in common. "2c421b05d03d20a935c9d84a1c93f747374f49d0" and "8cb9df8e4724d6b8398073b8ef1dd449b73afef0" have entirely different histories.
2c421b05d0 ... 8cb9df8e47

1 changed files with 22 additions and 29 deletions
Show Stats Expand all files Collapse all files

51
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/H5Controller.cs
View File

@ -145,14 +145,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI
DataReturn.code = 500; DataReturn.code = 500;
return DataReturn; return DataReturn;
} }
if (model.ORG_ID == Guid.Empty)
{
DataReturn.msg = "获取公司信息失败！";
DataReturn.code = 500;
return DataReturn;
}
var Tenant = this.Request.Headers["Tenant"]; var Tenant = this.Request.Headers["Tenant"];
Guid orgId = model.ORG_ID; Guid orgId = getOrgIdByTenant(Tenant);
var isrepeat = GetEntity<T_FM_USER>(t => t.CODE == model.Phone); var isrepeat = GetEntity<T_FM_USER>(t => t.CODE == model.Phone);
if (isrepeat != null) if (isrepeat != null)
{ {
@ -322,30 +316,29 @@ namespace APT.SC.WebApi.Controllers.Api.BI
public string ID_CARD { get; set; } public string ID_CARD { get; set; }
public DateTime InTime { get; set; } public DateTime InTime { get; set; }
public int WORKINGYEAR { get; set; } public int WORKINGYEAR { get; set; }
public Guid ORG_ID { get; set; }
} }
//private Guid getOrgIdByTenant(string Tenant) private Guid getOrgIdByTenant(string Tenant)
//{ {
// Guid orgId = Guid.Empty; Guid orgId = Guid.Empty;
// if (Tenant.Equals("0001"))//XLK if (Tenant.Equals("0001"))//XLK
// { {
// orgId = Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"); orgId = Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa");
// } }
// else if (Tenant.Equals("A0000024"))//豫鹭 else if (Tenant.Equals("A0000024"))//豫鹭
// { {
// orgId = Guid.Parse("d9871ba8-0eec-9e4a-bb87-7d5a540d8913"); orgId = Guid.Parse("d9871ba8-0eec-9e4a-bb87-7d5a540d8913");
// } }
// else if (Tenant.Equals("A0000025"))//金鼎 else if (Tenant.Equals("A0000025"))//金鼎
// { {
// orgId = Guid.Parse("8b3c41aa-51b1-7ce9-1879-248a038c1b5c"); orgId = Guid.Parse("8b3c41aa-51b1-7ce9-1879-248a038c1b5c");
// } }
// else if (Tenant.Equals("0002"))//龙岩稀土 else if (Tenant.Equals("0002"))//龙岩稀土
// { {
// orgId = Guid.Parse("8f1cf418-8bf3-ea3f-7a6d-fc5d61247008"); orgId = Guid.Parse("8f1cf418-8bf3-ea3f-7a6d-fc5d61247008");
// } }
// return orgId; return orgId;
//} }
#region 当班工作人员 #region 当班工作人员