|
@@ -551,7 +551,7 @@ public class EbaSystemServiceImpl implements EbaSystemService {
|
|
|
JSONObject crmProjectInfo = EbaUtils.crmProjectInfo;
|
|
|
List<Map> list = new ArrayList<>();
|
|
|
Set<String> ebeiProjects = crmProjectInfo.keySet();
|
|
|
- ebeiProjects.forEach(x -> list.add(Levi.by("ebaProjectId", data.get(x) == null ? "" : data.get(x)).set("ebaProjectName", data.get(x) == null ? "" : EbaUtils.project.getJSONObject(data.get(x).toString()).getString("projectName")).set("ebeiProjectId", x).set("ebeiProjectName", crmProjectInfo.getString(x))));
|
|
|
+ ebeiProjects.forEach(x -> list.add(Levi.by("ebaProjectId", data.get(x) == null ? "" : data.get(x)).set("ebaProjectName", data.get(x) == null ? "" : EbaUtils.project.getJSONObject(data.get(x).toString()) == null ? "" : EbaUtils.project.getJSONObject(data.get(x).toString()).getString("projectName")).set("ebeiProjectId", x).set("ebeiProjectName", crmProjectInfo.getString(x))));
|
|
|
Supplier<Stream<Map>> resStream = () -> list.stream();
|
|
|
List<Map> results = resStream.get().skip((pageBean.getPageNum() - 1) * pageBean.getPageSize()).limit(pageBean.getPageSize()).collect(Collectors.toList());
|
|
|
return ResponseBuilder.ok(PageBean.<Map>builder().total(resStream.get().count()).row(results).build());
|