Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms
This commit is contained in:
commit
1a69b1d7db
@ -6412,13 +6412,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
|
||||
{
|
||||
dynamic ret = new System.Dynamic.ExpandoObject();
|
||||
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
|
||||
var mineType = 30;
|
||||
//var mineType = 30;
|
||||
var departmentIds = new List<Guid>();
|
||||
List<GroupbyDepartmentCompletion> completionLists = new List<GroupbyDepartmentCompletion>();
|
||||
List<T_FM_DEPARTMENT_COMPLETION> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION>();
|
||||
if (string.IsNullOrEmpty(filter.Keyword))
|
||||
return ret;
|
||||
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
|
||||
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, new BaseFilter(orgId));//t.MineType == int.Parse(filter.Keyword.ToString())
|
||||
if (departmentInfo == null || !departmentInfo.Any())
|
||||
return ret;
|
||||
else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user