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

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/system/user copy.vue

@@ -706,7 +706,7 @@
    //公安局进入
    var parentId = null;
    var that = this;
    // if (this.userInfo.role_name == "公安管理员") {
    // if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {

    parentId = this.userInfo.dept_id;
    if (parentId == "1123598813738675201") {