Merge branch 'bug_fix' into feature

# Conflicts:
#	src/views/selectAgency/index.vue

src/views/selectAgency/index.vue

@@ -96,7 +96,13 @@ export default {
             this.signWX()
         },
         async getAgency(type) {
-            let res = await getAllOrgTreeList({ organizationName: this.district,pid:0 })
+            let parm ={
+                organizationName: this.district
+            }
+            if(!this.autoFlag){
+                parm.pid = 0
+            }
+            let res = await getAllOrgTreeList(parm)
             if (res.code === 0) {
                 if (type) {
                     this.selfCity.push({ label: this.district, children: res.data })