diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java b/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java index d4baaad89..781fbb21d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java @@ -244,9 +244,9 @@ public class IndexController { stateMap.put("result", jzBidResults.size()); stateMap.put("totalList", jzProjectList); stateMap.put("buildList", jzProjectList.stream().filter(l -> l.getStatus() == 1).collect(Collectors.toList())); - stateMap.put("follow", jzProjectList.stream().filter(j -> jzProjectFollowList.stream().map(b -> b.getProjectId()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); - stateMap.put("bidList", jzProjectList.stream().filter(j -> jzBidList.stream().map(b -> b.getProjectId()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); - stateMap.put("resultList", jzProjectList.stream().filter(j -> jzBidResults.stream().map(b -> b.getProjectId()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); + stateMap.put("follow", jzProjectList.stream().filter(j -> jzProjectFollowList.stream().map(b -> b.getProjectId().toString()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); + stateMap.put("bidList", jzProjectList.stream().filter(j -> jzBidList.stream().map(b -> b.getProjectId().toString()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); + stateMap.put("resultList", jzProjectList.stream().filter(j -> jzBidResults.stream().map(b -> b.getProjectId().toString()).collect(Collectors.toList()).contains(j.getId().toString())).collect(Collectors.toList())); return Result.success(stateMap); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidResultServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidResultServiceImpl.java index df21a626e..6ae61adb7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidResultServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzBidResultServiceImpl.java @@ -53,11 +53,11 @@ public class JzBidResultServiceImpl extends ServiceImpl