Browse Source

批量审核

wangtong 1 year ago
parent
commit
9fefe4d8cb

+ 0 - 1
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -62,7 +62,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
         zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
-
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(id);
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());

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

@@ -81,7 +81,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
             zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
             zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
-            bo.setId(item.getId());
+           // bo.setId(item.getId());
             ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
             zEngineeringInfoBoList.add(zEngineeringInfoBo1);

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

@@ -82,8 +82,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
-//        if (!LoginHelper.isAdmin())
-//            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
+        if (!LoginHelper.isAdmin())
+            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
         ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
 //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
         if (zEngineeringNode==null)