巡检点查询BUG

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.thoughtworks.xstream.mapper.Mapper;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -270,7 +271,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
                     vo.setType("area");
                     vo.setBizOrgCode(area.getBizOrgCode());
                     vo.setBizOrgName(area.getBizOrgName());
-                    vo.setParentId(area.getParentId().equals(0L) ? orgMap.get(area.getBizOrgCode()) : area.getParentId());
+                    vo.setParentId(Objects.isNull(area.getParentId()) || area.getParentId().equals(0L) ? orgMap.get(area.getBizOrgCode()) : area.getParentId());
                     return vo;
                 }).collect(Collectors.toList());
         orgTreeList.addAll(areaTreeVoList);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/FileHelper.java

@@ -1110,12 +1110,12 @@ private static void defaultExport(List<Map<String, Object>> list, String fileNam
 
         //表头样式
         HSSFCellStyle style = wb.createCellStyle();
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
+        style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式
         //字体样式
         HSSFFont fontStyle = wb.createFont();
         fontStyle.setFontName("微软雅黑");
         fontStyle.setFontHeightInPoints((short)12);
-        fontStyle.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        fontStyle.setBold(true);
         style.setFont(fontStyle);
 
         //新建sheet