diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index 650e2b3..479ed7d 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -26,6 +26,7 @@ namespace ZR.Admin.WebApi.Controllers private ISysFileService SysFileService; private readonly IStringLocalizer _localizer; public readonly ISysDeptService _deptService; + public readonly ISysDictDataService sysDictDataService; /// /// CommonController 构造函数 /// @@ -39,13 +40,15 @@ namespace ZR.Admin.WebApi.Controllers IOptions options, IWebHostEnvironment webHostEnvironment, ISysFileService fileService, - ISysDeptService deptService) + ISysDeptService deptService, + ISysDictDataService sysDictDataService) { WebHostEnvironment = webHostEnvironment; SysFileService = fileService; OptionsSetting = options.Value; _localizer = stringLocalizer; _deptService = deptService; + this.sysDictDataService = sysDictDataService; } /// @@ -221,7 +224,8 @@ namespace ZR.Admin.WebApi.Controllers var children = await _deptService.AsQueryable().Where(it => it.ParentId == topDept.DeptId && it.DelFlag == 0 && it.Status == 0).Select(it => it.DeptName).ToListAsync(); deptList = children; } - return SUCCESS(new { logo = file?.AccessUrl ?? "", deptList }); + var list = await sysDictDataService.AsQueryable().Where(it => it.DictType == "sys_construction_status" && it.Status == "0").Select(it => it.DictValue).ToListAsync(); + return SUCCESS(new { logo = file?.AccessUrl ?? "", deptList, construction = list }); } }