提交非Null判断

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -27,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -473,6 +476,9 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type
 	queryWrapper1.eq(FireTeam::getCompanyName, "消防救援保障部");
 	queryWrapper1.isNull(FireTeam::getParent);
 	FireTeam parentFireTeam=	this.baseMapper.selectOne(queryWrapper1);
+	if(parentFireTeam==null ) {
+		return null;
+	}
 	 return	TreeParser.getTree(parentFireTeam.getSequenceNbr() , this.baseMapper.selectList(queryWrapper), FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
 				null);
 	// TODO Auto-generated method stub