Merge branch 'master' into 2.5dev

2019-12-25 16:48:34 +08:00
parent 060e3e2059 f7c65d67ca
commit ab7c23f383
7 changed files with 8 additions and 16 deletions
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -123,7 +123,7 @@ export default {
    },
    // 提交前的验证
    [CRUD.HOOK.afterValidateCU]() {
-      if (!this.form.pid) {
+      if (!this.form.pid && this.form.id !== 1) {
        this.$message({
          message: '上级部门不能为空',
          type: 'warning'