Commit 5a443de5 authored by zhangsen's avatar zhangsen

bug xiugai

parent a1554de0
...@@ -881,6 +881,7 @@ public class PointController extends AbstractBaseController { ...@@ -881,6 +881,7 @@ public class PointController extends AbstractBaseController {
downData.add(new String[0]); downData.add(new String[0]);
} }
//责任人 //责任人
if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode()); Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
List<Map<String,String>> personlist = (List<Map<String,String>>)o; List<Map<String,String>> personlist = (List<Map<String,String>>)o;
String[] person = new String[personlist.size()]; String[] person = new String[personlist.size()];
...@@ -892,18 +893,24 @@ public class PointController extends AbstractBaseController { ...@@ -892,18 +893,24 @@ public class PointController extends AbstractBaseController {
}else { }else {
downData.add(new String[0]); downData.add(new String[0]);
} }
} else {
downData.add(new String[0]);
}
if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
//所在建筑 //所在建筑
FeignClientResult result = equipFeign.myTreeList(); FeignClientResult result = equipFeign.myTreeList();
Object obj = result.getResult(); Object obj = result.getResult();
List<Map<String,Object>> treeMap = (List<Map<String,Object>>)obj; List<Map<String, Object>> treeMap = (List<Map<String, Object>>) obj;
String[] build = new String[treeMap.size()]; String[] build = new String[treeMap.size()];
if (CollectionUtils.isNotEmpty(treeMap)){ if (CollectionUtils.isNotEmpty(treeMap)) {
for (int i = 0; i < treeMap.size(); i++) { for (int i = 0; i < treeMap.size(); i++) {
build[i] = treeMap.get(i).get("instanceName")+"@"+treeMap.get(i).get("instanceId"); build[i] = treeMap.get(i).get("instanceName") + "@" + treeMap.get(i).get("instanceId");
} }
} }
downData.add(build); downData.add(build);
} else {
downData.add(new String[0]);
}
String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始) String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始)
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment