场景修改为get

sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -70,8 +70,10 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             sceneEntities.addAll(findByParentLike(item.getId()));
         }
         for (SceneEntity item : sceneEntities) {
-            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
-            item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
+            if (item.getCompanyOrgId() != null)
+                item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
+            if (item.getDeptOrgId() != null)
+                item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
         }
         List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
         sceneEntityPage.setRecords(sceneTree);