修改细节问题

components/organization/index.js

@@ -27,7 +27,9 @@ Component({
     },
     data: {
         takeEffect: "", //生效筛选项
-        result: {},
+        result: {
+            name: null
+        },
         isleave: 1,
         tabs: [{
             value: 0,
@@ -66,6 +68,7 @@ Component({
                 isleave: e.currentTarget.dataset.value,
                 'result.isleave': e.currentTarget.dataset.value
             })
+            console.log("result", this.data.result)
             this.initDepAndUser(false);
         },
         initDepAndUser(init = true) {
@@ -91,7 +94,7 @@ Component({
                     })
                     if (this.data.isusers) {
                         let active = ''
-                        if (this.data.defaultMy) {
+                        if (this.data.defaultMy && !this.data.result.name) {
                             let user = res.data.hr.find(v => v.userid == wx.getStorageSync('userMsg').userid)
                             if (user) {
                                 active = user.userid;

salesPanel/salesHourglass/index.wxml

@@ -1,7 +1,7 @@
 <view class="head" hover-class="navigator-hover" bindtap="openFiltrate">
 	<view class="filter">
 		<text class="iconfont icon-shaixuan" />
-		{{language[username]||username}}_{{language[content.where.isleave===1?'在职':content.where.isleave?'离职':'全部']||content.where.isleave===1?'在职':content.where.isleave?'离职':'全部'}}
+		{{language[username]||username}}_{{language[content.where.isleave==1?'在职':content.where.isleave?'离职':'全部']||content.where.isleave==1?'在职':content.where.isleave?'离职':'全部'}}
 	</view>
 	<view class="filter">
 		<text class="iconfont icon-lingyu" />