测试
This commit is contained in:
parent
eaa5f3f610
commit
34d377bb65
|
|
@ -26,6 +26,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||||
private ISysFileService SysFileService;
|
private ISysFileService SysFileService;
|
||||||
private readonly IStringLocalizer<SharedResource> _localizer;
|
private readonly IStringLocalizer<SharedResource> _localizer;
|
||||||
public readonly ISysDeptService _deptService;
|
public readonly ISysDeptService _deptService;
|
||||||
|
public readonly ISysDictDataService sysDictDataService;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// CommonController 构造函数
|
/// CommonController 构造函数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -39,13 +40,15 @@ namespace ZR.Admin.WebApi.Controllers
|
||||||
IOptions<OptionsSetting> options,
|
IOptions<OptionsSetting> options,
|
||||||
IWebHostEnvironment webHostEnvironment,
|
IWebHostEnvironment webHostEnvironment,
|
||||||
ISysFileService fileService,
|
ISysFileService fileService,
|
||||||
ISysDeptService deptService)
|
ISysDeptService deptService,
|
||||||
|
ISysDictDataService sysDictDataService)
|
||||||
{
|
{
|
||||||
WebHostEnvironment = webHostEnvironment;
|
WebHostEnvironment = webHostEnvironment;
|
||||||
SysFileService = fileService;
|
SysFileService = fileService;
|
||||||
OptionsSetting = options.Value;
|
OptionsSetting = options.Value;
|
||||||
_localizer = stringLocalizer;
|
_localizer = stringLocalizer;
|
||||||
_deptService = deptService;
|
_deptService = deptService;
|
||||||
|
this.sysDictDataService = sysDictDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -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();
|
var children = await _deptService.AsQueryable().Where(it => it.ParentId == topDept.DeptId && it.DelFlag == 0 && it.Status == 0).Select(it => it.DeptName).ToListAsync();
|
||||||
deptList = children;
|
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 });
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user