Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/api/modules/http.js

@@ -468,7 +468,7 @@ export function agentListupdate(query) {
 //获取楼盘下部门
 export function overviewfindList(query) {
   return request({
-    url: 'admin/dept/findList',
+    url: 'admin/dept/findListByUser',
     method:'get',
     params:query
   })

src/views/Statistics/ConsultantBrand.vue

@@ -471,19 +471,27 @@ export default {
       });
     },
     deptFindList() {
+       this.options=[];
       // 获取团队
-      this.$api.api
-        .deptFindList({
+        this.$api.http.overviewfindList({
           houseId: this.houseId,
         })
         .then((res) => {
-          this.options = [
+          let userinfo=JSON.parse(sessionStorage.getItem("zk-userInfo"))
+          if(userinfo.content.deptType==1){
+              this.options.push(...res.data);
+              this.deptId= this.options[0].deptId
+          }else{
+              this.options = [
             {
               name: "全部",
               deptId: "",
             },
           ];
+          this.deptId='';
           this.options.push(...res.data);
+          }
+
           this.accountRank();
         });
     },

src/views/Statistics/ReceptionStatistical.vue

@@ -387,18 +387,24 @@ export default {
     },
     deptFindList() {
       // 获取团队
-      this.$api.api
-        .deptFindList({
+       this.$api.http.overviewfindList({
           houseId: this.houseId,
         })
         .then((res) => {
-          this.options = [
-            {
-              name: "全部",
-              deptId: "",
-            },
-          ];
-          this.options.push(...res.data);
+          let userinfo=JSON.parse(sessionStorage.getItem("zk-userInfo"))
+          if(userinfo.content.deptType==1){
+               this.options.push(...res.data);
+              this.deptId= this.options[0].deptId
+          }else{
+             this.options = [
+              {
+                name: "全部",
+                deptId: "",
+              },
+            ];
+            this.options.push(...res.data);
+            this.deptId=''
+          }
           this.receptionStatisticsAllAccount();
           this.accountRank();