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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2025-11-28 15:45:38 +08:00
commit 75b890e68d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,7 +796,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
{ {
var param = ((FMDepartmentType)departmentInfo.DEPARTMENT_TYPE).GetDescription(); var param = ((FMDepartmentType)departmentInfo.DEPARTMENT_TYPE).GetDescription();
var param2 = ((FMDepartmentType)roleInfo.DEPARTMENT_TYPE).GetDescription(); var param2 = ((FMDepartmentType)roleInfo.DEPARTMENT_TYPE).GetDescription();
throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致"); //throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致");
} }
} }
} }

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -608,7 +608,7 @@ namespace APT.SK.WebApi.Controllers
{ {
record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL); record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
} }
var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.RISK_AREA_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList(); var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
result.Data = data; result.Data = data;
result.TotalCount = groupRecords.Count; result.TotalCount = groupRecords.Count;
} }
@ -639,6 +639,7 @@ namespace APT.SK.WebApi.Controllers
ruleLevel.Field = "HIDDEN_LEVEL"; ruleLevel.Field = "HIDDEN_LEVEL";
ruleLevel.Value = entity.HIDDEN_LEVEL; ruleLevel.Value = entity.HIDDEN_LEVEL;
pageFilter = new KeywordPageFilter(); pageFilter = new KeywordPageFilter();
pageFilter.IgnoreDataRule = true;
pageFilter.FilterGroup.Rules.Add(ruleArea); pageFilter.FilterGroup.Rules.Add(ruleArea);
pageFilter.FilterGroup.Rules.Add(ruleOrg); pageFilter.FilterGroup.Rules.Add(ruleOrg);
pageFilter.FilterGroup.Rules.Add(ruleContent); pageFilter.FilterGroup.Rules.Add(ruleContent);