|
@@ -1083,12 +1083,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
|
|
BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
|
|
BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
|
|
baseBuildAddVO.setBaseBuild(list4.get(j));
|
|
baseBuildAddVO.setBaseBuild(list4.get(j));
|
|
for (int k = 0; k < list5.size(); k++) {
|
|
for (int k = 0; k < list5.size(); k++) {
|
|
- if (list4.get(j).getId()==list5.get(k).getBuildId()){
|
|
|
|
|
|
+ if (list4.get(j).getId().equals(list5.get(k).getBuildId())){
|
|
baseBuildAddVO.setBaseBuildAttach(list5.get(k));
|
|
baseBuildAddVO.setBaseBuildAttach(list5.get(k));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (int l = 0; l < list6.size(); l++) {
|
|
for (int l = 0; l < list6.size(); l++) {
|
|
- if (list4.get(j).getId()==list6.get(l).getBuildId()){
|
|
|
|
|
|
+ if (list4.get(j).getId().equals(list6.get(l).getBuildId())){
|
|
list8.add(list6.get(l));
|
|
list8.add(list6.get(l));
|
|
baseBuildAddVO.setBaseBuildExtinguishList(list8);
|
|
baseBuildAddVO.setBaseBuildExtinguishList(list8);
|
|
}
|
|
}
|