修改循环中删除使用迭代方式运行

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -674,20 +674,21 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         });
         if((!"".equals(bo.getBeginTime())&&!ObjectUtils.isEmpty(bo.getBeginTime()))||(!"".equals(bo.getCreateBy())&&!ObjectUtils.isEmpty(bo.getCreateBy())))
         {
-            nodeTypeList.stream().forEach(item->{
-                String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+            Iterator<ZEngineeringNode> iterator = nodeTypeList.iterator();
+            while(iterator.hasNext()) {
+                ZEngineeringNode item = iterator.next();
+                String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
                 MonthTableNameHandler.setData(date);
                 LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
-                lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getId, item.getId());
-                lqw.like(ZEngineeringInfo::getCreateBy, bo.getCreateBy()+"%");
-//                lqw.eq(ZEngineeringInfo::getUpdateInfoTime, bo.getReviewTime());
-                lqw.between(ZEngineeringInfo::getUpdateInfoTime,bo.getBeginTime().get(0),bo.getBeginTime().get(1));
-
-                if (zEngineeringInfoMapper.selectCount(lqw)==0)
-                {
-                    nodeTypeList.remove(item);
+                lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getEngInfoId, item.getId());
+                lqw.like(ZEngineeringInfo::getCreateBy, bo.getCreateBy());
+                if(!"".equals(bo.getBeginTime())&&!ObjectUtils.isEmpty(bo.getBeginTime())){
+                    lqw.between(ZEngineeringInfo::getUpdateInfoTime,bo.getBeginTime().get(0),bo.getBeginTime().get(1));
                 }
-            });
+                if (zEngineeringInfoMapper.selectCount(lqw)==0){
+                    iterator.remove();
+                }
+            }
         }
         List<String>IDList=new ArrayList<>();
         if (!ObjectUtils.isEmpty(nodeTypeList))