Compare commits

..

No commits in common. "7d0a6b78bfff121c04b3279c9fd18d8e8014558a" and "f13816a171d67660a9fd582c36cde776dad48412" have entirely different histories.

View File

@ -51,7 +51,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
public JsonActionResult<IEnumerable<T_FM_DEPARTMENT>> OrderEntities([FromBody] KeywordFilter filter) public JsonActionResult<IEnumerable<T_FM_DEPARTMENT>> OrderEntities([FromBody] KeywordFilter filter)
{ {
filter.FilterGroup.Rules.Add(new FilterRule() { Field = "ENABLE_STATUS", Operate = FilterOperate.Equal, Value = 0 }); filter.FilterGroup.Rules.Add(new FilterRule() { Field = "ENABLE_STATUS", Operate = FilterOperate.Equal, Value = 0 });
filter.FilterGroup.Rules.Add(new FilterRule() { Field = "CATEGORY", Operate = FilterOperate.NotEqual, Value = 15 }); filter.FilterGroup.Rules.Add(new FilterRule() { Field = "CATEGORY", Operate = FilterOperate.Equal, Value = 5 });
var result = WitOrderEntities(null, filter); var result = WitOrderEntities(null, filter);
if (result.Data.Count() > 0) if (result.Data.Count() > 0)
{ {
@ -119,9 +119,9 @@ namespace APT.FM.WebApi.Controllers.Api.FM
//默认非外包 //默认非外包
FilterRule filterRule = new FilterRule(); FilterRule filterRule = new FilterRule();
filterRule.Field = "CATEGORY"; filterRule.Field = "CATEGORY";
filterRule.Value = FMCATEGORY.WB; filterRule.Value = FMCATEGORY.ACTURE;
filterRule.IsSysParamRule = false; filterRule.IsSysParamRule = false;
filterRule.Operate = FilterOperate.NotEqual; filterRule.Operate = FilterOperate.Equal;
pageFilter.FilterGroup.Rules.Add(filterRule); pageFilter.FilterGroup.Rules.Add(filterRule);
} }