修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -697,7 +697,7 @@ public class CommandController extends BaseController {
             orgusrDataxDto.setOrgUsrzhDto(orgUsrzhDto!=null&&orgUsrzhDto.size()>0?orgUsrzhDto.get(0):null);
 //            buildId=orgUsrzhDto!=null&&orgUsrzhDto.size()>0?orgUsrzhDto.get(0).getBuildId():null;
             if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
-                buildId=orgUsrzhDto.get(0).getBuildId();
+                buildId=orgUsrzhDto.get(0).getBuildId()==null?null:orgUsrzhDto.get(0).getBuildId();
             }
     	}
         
@@ -834,10 +834,10 @@ public class CommandController extends BaseController {
             List<OrgUsrzhDto> orgUsrzhDto= iOrgUsrService.getOrgUsrzhDto( AlertCalled.getUnitInvolved());
 
             if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
-                buildId=Long.valueOf(orgUsrzhDto.get(0).getBuildId());
+                buildId=orgUsrzhDto.get(0).getBuildId()==null?null:Long.valueOf(orgUsrzhDto.get(0).getBuildId());
             }
         }
-        return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildId));
+        return ResponseHelper.buildResponse(buildId==null?null:keySiteService.getBuildAndKeyTree(buildId));
     }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -288,6 +288,8 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		}).collect(Collectors.toList());
 		List<OrgMenuDto> list1 = new ArrayList<OrgMenuDto>();
 		OrgMenuDto orgMenuDto =new OrgMenuDto();
+		orgMenuDto.setKey(sequenceNbr);
+		orgMenuDto.setValue(sequenceNbr);
 		orgMenuDto.setChildren(buildTreeParallel(menuList));
 		orgMenuDto.setName(buildNameString);
 		orgMenuDto.setTitle(buildNameString);