修复bug

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

@@ -416,6 +416,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     public Boolean update(ZEngineeringInfoBo bo) {
         bo.setHeadName(LoginHelper.getLoginUser().getUserId().toString());
         bo.setConstructUser(LoginHelper.getLoginUser().getUserId().toString());
+        bo.setState(null);
         ZEngineeringInfo update = BeanUtil.toBean(bo, ZEngineeringInfo.class);
         validEntityBeforeSave(update);
         List<ZEngiineeringPhoto> photoList = new ArrayList();

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

@@ -646,16 +646,21 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                     lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                     List<ZEngineeringReview> ReviewList = zEngineeringReviewMapper.selectList(lqw2);
-                    if (state.equals("0"))
+                    if (state.equals("2"))
                     {
-                    if (ReviewList.size() == 0 || ReviewList.get(0).getReviewStatus().equals("0")) {
+                    if (ReviewList.size() == 0 ) {
                         nodeTypeList.add(item2);
                     }
-                    }else
+                    }else if (state.equals("1"))
                     {
                         if (ReviewList.size() > 0 && ReviewList.get(0).getReviewStatus().equals("1")) {
                             nodeTypeList.add(item2);
                         }
+                    }else if (state.equals("0"))
+                    {
+                        if (ReviewList.size() > 0 && ReviewList.get(0).getReviewStatus().equals("0")) {
+                            nodeTypeList.add(item2);
+                        }
                     }
                 });
             }
@@ -705,7 +710,6 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
             List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
             nodeList.stream().forEach(item2->{
-
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                 List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
@@ -737,8 +741,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 ReViewStateMap.get().add(map);
             }
             statemap.put(item.getId(),ReViewStateMap.get());
-            MonthTableNameHandler.removeData();
 
+            MonthTableNameHandler.removeData();
         });
 
         return statemap;