|
@@ -1336,8 +1336,12 @@ public class ProjectService {
|
|
|
return HttpResult.ok("删除关联设备成功!");
|
|
return HttpResult.ok("删除关联设备成功!");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public HttpResult selectAll() {
|
|
|
|
|
- List<KwsProject> kwsProjects = projectMapper.selectList(new LambdaQueryWrapper<KwsProject>().eq(KwsProject::getDelFlag, 0));
|
|
|
|
|
|
|
+ public HttpResult selectAll(HttpServletRequest request) {
|
|
|
|
|
+ HeaderData headerData = commonService.getHeaderData(request);
|
|
|
|
|
+ List<KwsProject> kwsProjects = projectMapper.selectList(new LambdaQueryWrapper<KwsProject>()
|
|
|
|
|
+ .eq(KwsProject::getDelFlag, 0)
|
|
|
|
|
+ .eq(org.apache.commons.lang3.StringUtils.isNotBlank(headerData.getCompanyId()), KwsProject::getCompanyId, headerData.getCompanyId())
|
|
|
|
|
+ );
|
|
|
Map<Long, String> projectMap = new HashMap<>();
|
|
Map<Long, String> projectMap = new HashMap<>();
|
|
|
if (!CollectionUtils.isEmpty(kwsProjects)) {
|
|
if (!CollectionUtils.isEmpty(kwsProjects)) {
|
|
|
projectMap = kwsProjects.stream().collect(Collectors.toMap(KwsProject::getId, KwsProject::getName));
|
|
projectMap = kwsProjects.stream().collect(Collectors.toMap(KwsProject::getId, KwsProject::getName));
|