Browse Source

修改bug

qinhouyu 1 year ago
parent
commit
5fc74e678b

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

@@ -68,7 +68,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
 //        return PageUtils.buildDataInfo(list);
         Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         Page<ZComprehensiveVo> result = baseMapper.queryPageList(bo,page,pageQuery.getPageNum(), pageQuery.getPageSize());
-        page.setTotal(result.getRecords() != null ? result.getRecords().get(0).getTotal():0);
+        page.setTotal((result.getRecords() != null&&!result.getRecords().isEmpty()) ? result.getRecords().get(0).getTotal():0);
         return TableDataInfo.build(result);
     }
 

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

@@ -194,7 +194,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         bo.getzEngineeringNodeBo().setType(bo.getType());
         bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(bo.getId());
+        zEngineeringNodeBo.setCivliId(update.getId());
         zEngineeringNodeBo.setType(bo.getType());
         zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
         ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);