bug6331修改：获取管辖单位树空指针错误

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -120,7 +120,7 @@ public class UnitInfoController extends BaseController {
 		Iterator<CompanyModel> it = result.iterator();
 		while(it.hasNext()) {
 			CompanyModel temp = it.next();
-			if(temp.getLevel().equals("emergencyCenter")  || temp.getLevel().equals("company")) {
+			if("emergencyCenter".equals(temp.getLevel())  || "company".equals(temp.getLevel())) {
 				it.remove();
 			} else {
 				this.dealCompanyTree(temp);
@@ -617,35 +617,35 @@ public class UnitInfoController extends BaseController {
 
 
 	private void dealCompanyTree(CompanyModel company) {
-		if(!company.getLevel().equals("emergencyCenter") && !company.getLevel().equals("company")) {
+		if(!"emergencyCenter".equals(company.getLevel()) && !"company".equals(company.getLevel())) {
 			// 判断子节点是否是headquarter
 			Collection children = company.getChildren();
-			Iterator<Map> it = children.iterator();
-			while(it.hasNext()) {
-				Map temp =  it.next();
-				if(company.getLevel().equals("emergencyCenter")  || company.getLevel().equals("company")) {
-					it.remove();
-				} else {
-					this.dealCompanyTree(temp);
+			if (!ValidationUtil.isEmpty(children)) {
+				Iterator<Map> it = children.iterator();
+				while(it.hasNext()) {
+					Map temp =  it.next();
+					if("emergencyCenter".equals(company.getLevel())  || "company".equals(company.getLevel())) {
+						it.remove();
+					} else {
+						this.dealCompanyTree(temp);
+					}
 				}
 			}
-		} else {
-			return;
 		}
 	}
 	private void dealCompanyTree(Map company) {
 		// 判断子节点是否是headquarter
 		Collection children = (Collection) company.get("children");
-		Iterator<Map> it = children.iterator();
-		while(it.hasNext()) {
-			Map temp = it.next();
-			if(temp.get("level").equals("emergencyCenter") || temp.get("level").equals("company")) {
-				it.remove();
-			} else {
-				this.dealCompanyTree(temp);
+		if (!ValidationUtil.isEmpty(children)) {
+			Iterator<Map> it = children.iterator();
+			while(it.hasNext()) {
+				Map temp = it.next();
+				if("emergencyCenter".equals(temp.get("level")) || "company".equals(temp.get("level"))) {
+					it.remove();
+				} else {
+					this.dealCompanyTree(temp);
+				}
 			}
 		}
 	}
-
-
 }