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

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/talk/talk.vue

@@ -322,8 +322,12 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
        params["jurisdiction"] = this.userInfo.jurisdiction;
      }else{
        params["deptid"] = this.userInfo.dept_id;
      }
      this.loading = true;
      // console.log(1);
      getList(
        page.currentPage,
        page.pageSize,