Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-11-30 93b69073443d8b7ea2dfc93b1b8c4bb201f3d56d

 src/views/system/user.vue

@@ -792,7 +792,6 @@
      //公安局进入
      if (
        this.userInfo.role_name == "公安管理员"
        
      ) {
        var parentId = this.userInfo.dept_id;
        var userId = this.userInfo.Id;
@@ -800,11 +799,12 @@
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
      } else {
        // getDeptLazyTree(0).then((res) => {
        //   const column = this.findObject(this.option.group, "deptId");
        //   column.dicData = res.data.data;
        // });
      } else if( this.userInfo.role_name == "administrator"){
        getDeptLazyTree(0).then((res) => {
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
      }else {
        getSecurityDeptTree(null,null,this.userInfo.dept_id).then((res) => {
            const column = this.findObject(this.option.group, "deptId");
            column.dicData = res.data.data;