Merge branch 'master' into shibei_master

src/views/modules/visual/plugin/power/organization.vue

@@ -405,14 +405,14 @@ export default {
     // 取最后一级组织的第一条数据的 orgId
     setListAgencyId_one(subOrgList) {
       if (subOrgList[0].subOrgList && subOrgList[0].subOrgList.length > 0) {
-        this.setAgencyId_two(subOrgList[0].subOrgList)
+        return this.setAgencyId_two(subOrgList[0].subOrgList)
       } else {
         return subOrgList[0].orgId
       }
     },
     setAgencyId_two(subOrgList) {
       if (subOrgList[0].subOrgList && subOrgList[0].subOrgList.length > 0) {
-        this.setListAgencyId_one(subOrgList[0].subOrgList)
+        return this.setListAgencyId_one(subOrgList[0].subOrgList)
       } else {
         return subOrgList[0].orgId
       }