Merge branch 'master' into deploy

src/api/system/dept.js

@@ -8,10 +8,11 @@ export function getDepts(params) {
   })
 }
 
-export function getDeptSuperior(ids) {
+export function getDeptSuperior(ids, exclude) {
+  exclude = exclude !== undefined ? exclude : false
   const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
   return request({
-    url: 'api/dept/superior',
+    url: 'api/dept/superior?exclude=' + exclude,
     method: 'post',
     data
   })

src/views/system/dept/index.vue

@@ -161,10 +161,10 @@ export default {
       }
     },
     getSupDepts(id) {
-      crudDept.getDeptSuperior(id).then(res => {
+      crudDept.getDeptSuperior(id, true).then(res => {
-        const date = res.content
+        const data = res.content
-        this.buildDepts(date)
+        this.buildDepts(data)
-        this.depts = date
+        this.depts = data
       })
     },
     buildDepts(depts) {