From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/common/CommonHeader.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/company/src/components/common/CommonHeader.vue b/company/src/components/common/CommonHeader.vue
index 90aa22d..a5705fc 100644
--- a/company/src/components/common/CommonHeader.vue
+++ b/company/src/components/common/CommonHeader.vue
@@ -101,14 +101,13 @@
if (userInfo == null) {
return ''
}
- if(userInfo.type === 1){
- if (userInfo.company != null && userInfo.company.name.trim().length > 0) {
+ if (userInfo.type === 1 && userInfo.company != null && userInfo.company.name.trim().length > 0) {
+ if (userInfo.company.username === userInfo.username){
return userInfo.company.name
}
- }else{
- if (userInfo.realname != null && userInfo.realname.trim().length > 0) {
- return userInfo.realname
- }
+ }
+ if (userInfo.realname != null && userInfo.realname.trim().length > 0) {
+ return userInfo.realname
}
return userInfo.username
}
--
Gitblit v1.9.3