close #594 切换身份数据处理

TEAMModelOS/ClientApp/src/common/BaseUserPoptip.vue

@@ -19,7 +19,7 @@
                 <DropdownMenu slot="list" class="user-center-wrap">
                     <DropdownItem class="user-info-wrap" @click.native="toUserCenter()">
                         <p>{{userInfo.username}}</p>
-                        <p class="user-id">{{`ID: ${user.id}`}}</p>
+                        <p class="user-id">{{`ID: ${userInfo.id}`}}</p>
                         <Icon class="user-info-arrow" type="ios-arrow-forward" color="#fff" />
                     </DropdownItem>
                     <DropdownItem class="drop-item" style="margin-top:8px" @click.native="onRoleSelect('student')">
@@ -104,6 +104,7 @@ export default {
                 this.curRole = this.user.roles[0]
             }
             this.userInfo.username = this.user.name
+            this.userInfo.id = this.user.id || this.user.sub
             this.userInfo.nameColor = this.randomColor()
             this.userInfo.courseNum = user_profile.courses.length
         },

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/cusMgt.js

@@ -166,8 +166,8 @@ export default {
     notime1:'暂未设置时段，请先',
     notime2:'设置时段',
     notime3:'再安排上课时段。',
-    listType1:'班级名单',
-    listType2:'自定义名单',
+    listType1:'行政班',
+    listType2:'教学班',
     confirmAdd:'确认添加',
     cancelAdd:'取消添加',
     createList:'创建自定义名单',

TEAMModelOS/ClientApp/src/view/Home.vue

@@ -49,13 +49,13 @@ export default {
         }
         if (user_profile.schools.length) {
             this.$store.commit('setUserInfo', {
-                TEAMModelId: user.id,
+                TEAMModelId: user.id || user.sub,
                 name: user.name,
                 schoolCode: user_profile.defaultschool || user_profile.schools[0].schoolId
             })
         } else {
             this.$store.commit('setUserInfo', {
-                TEAMModelId: user.id,
+                TEAMModelId: user.id || user.sub,
                 name: user.name,
                 schoolCode: this.$GLOBAL.DEFAULT_SCHOOL_CODE
             })

TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.vue

@@ -423,7 +423,6 @@ export default {
                     render: (h, params) => {
                         let p = ['content-read','exercise-read','knowledge-read','syllabus-read']
                         let flag = false
-                        console.log('教师数据',params)
                         params.row.permissions.forEach(item=>{
                             if(!p.includes(item)){
                                 flag = true