bug xiugai

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -881,29 +881,36 @@ public class PointController extends AbstractBaseController {
 			downData.add(new String[0]);
 		}
 		//责任人
-		Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
-		List<Map<String,String>> personlist = (List<Map<String,String>>)o;
-		String[] person = new String[personlist.size()];
-		if (CollectionUtils.isNotEmpty(personlist)){
-			for (int i = 0; i < personlist.size(); i++) {
-				person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
+			List<Map<String,String>> personlist = (List<Map<String,String>>)o;
+			String[] person = new String[personlist.size()];
+			if (CollectionUtils.isNotEmpty(personlist)){
+				for (int i = 0; i < personlist.size(); i++) {
+					person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+				}
+				downData.add(person);
+			}else {
+				downData.add(new String[0]);
 			}
-			downData.add(person);
-		}else {
+		} else {
 			downData.add(new String[0]);
 		}
-
-		//所在建筑
-		FeignClientResult result = equipFeign.myTreeList();
-		Object obj = result.getResult();
-		List<Map<String,Object>> treeMap = (List<Map<String,Object>>)obj;
-		String[] build = new String[treeMap.size()];
-		if (CollectionUtils.isNotEmpty(treeMap)){
-			for (int i = 0; i < treeMap.size(); i++) {
-				build[i] = treeMap.get(i).get("instanceName")+"@"+treeMap.get(i).get("instanceId");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			//所在建筑
+			FeignClientResult result = equipFeign.myTreeList();
+			Object obj = result.getResult();
+			List<Map<String, Object>> treeMap = (List<Map<String, Object>>) obj;
+			String[] build = new String[treeMap.size()];
+			if (CollectionUtils.isNotEmpty(treeMap)) {
+				for (int i = 0; i < treeMap.size(); i++) {
+					build[i] = treeMap.get(i).get("instanceName") + "@" + treeMap.get(i).get("instanceId");
+				}
 			}
+			downData.add(build);
+		} else {
+			downData.add(new String[0]);
 		}
-		downData.add(build);
 		String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始)
 
 		try {