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

Compare commits

base: wyw:e0c0525dd80b057ee5a6778256bf9b1de6d19f31
Branches Tags
wyw:master
..
compare: wyw:1a9edcad1a5a526da6ed561799d0d07b9d49c2c6
Branches Tags
wyw:master

No commits in common. "e0c0525dd80b057ee5a6778256bf9b1de6d19f31" and "1a9edcad1a5a526da6ed561799d0d07b9d49c2c6" have entirely different histories.
e0c0525dd8 ... 1a9edcad1a

5 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -174,7 +174,7 @@ namespace APT.FM.WebApi.Controllers.Api
appFilter.Order = DbOrder.DESC; appFilter.Order = DbOrder.DESC;
appFilter.Sort = "CREATE_TIME"; appFilter.Sort = "CREATE_TIME";
//查询指定租户 //查询指定租户
appFilter.SpecifyTenant = "003"; appFilter.SpecifyTenant = "0003";
appFilter.IsSpecifyDb = true; appFilter.IsSpecifyDb = true;
appFilter.IgnoreOrgRule = true; appFilter.IgnoreOrgRule = true;
var appVersion = this.GetEntity<T_PF_APP_VERSION>(null, appFilter, "Nav_Files.Nav_ImgFile"); var appVersion = this.GetEntity<T_PF_APP_VERSION>(null, appFilter, "Nav_Files.Nav_ImgFile");

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
View File

@ -30,7 +30,7 @@ namespace APT.PF.WebApiControllers.Api.PF
{ {
BaseFilter filter = new BaseFilter(); BaseFilter filter = new BaseFilter();
filter.IsSpecifyDb = true; filter.IsSpecifyDb = true;
filter.SpecifyTenant = "003"; filter.SpecifyTenant = "0003";
filter.IgnoreOrgRule = true; filter.IgnoreOrgRule = true;
filter.Order = DbOrder.DESC; filter.Order = DbOrder.DESC;
filter.Sort = "CREATE_TIME"; filter.Sort = "CREATE_TIME";

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
View File

@ -651,7 +651,7 @@
return SafeExecute(() => return SafeExecute(() =>
{ {
T_PF_APPROVE result = null; T_PF_APPROVE result = null;
if (!string.IsNullOrEmpty(filter.Parameter22) && filter.OrgId.HasValue && filter.Parameter22 != filter.OrgId.Value.ToString()) if (!string.IsNullOrEmpty(filter.Parameter1) && filter.OrgId.HasValue && filter.Parameter1 != filter.OrgId.Value.ToString())
{ {
//集团人员 通过 首页点击 获取对应的数据库链接 返回结果 //集团人员 通过 首页点击 获取对应的数据库链接 返回结果

9
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -216,16 +216,11 @@ namespace APT.SK.WebApi.Controllers.Api
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
KeywordFilter filter2 = new KeywordFilter();
filter2.IgnoreDataRule = true;
filter2.IgnoreOrgRule = true;
filter2.OrgId = null;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(e => e.ID == new Guid(id), filter2, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter2, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

2
APT.Utility/HeadHelper.cs
View File

@ -8,7 +8,7 @@ namespace APT.Utility
/// <summary> /// <summary>
/// 地球半径 /// 地球半径
/// </summary> /// </summary>
public const string HeadtelnetCode = "003"; public const string HeadtelnetCode = "0003";
public static bool GetIsHead(IHeaderDictionary Headers) public static bool GetIsHead(IHeaderDictionary Headers)
{ {