diff --git a/frontend/src/pages/sys-admin/dingtalk/dingtalk-department-members-list.js b/frontend/src/pages/sys-admin/dingtalk/dingtalk-department-members-list.js index b7f4b56624..6124be3472 100644 --- a/frontend/src/pages/sys-admin/dingtalk/dingtalk-department-members-list.js +++ b/frontend/src/pages/sys-admin/dingtalk/dingtalk-department-members-list.js @@ -25,7 +25,7 @@ class DingtalkDepartmentMembersList extends Component { const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props; const membersList = this.props.membersList.map((member, index) => { let avatar = member.avatar; - if (member.avatar.length > 0) { + if (member.avatar && member.avatar.length > 0) { avatar = member.avatar; } else { avatar = siteRoot + 'media/avatars/default.png'; diff --git a/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js b/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js index afefbdc030..bdbb436790 100644 --- a/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js +++ b/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js @@ -25,7 +25,7 @@ class WorkWeixinDepartmentMembersList extends Component { const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props; const membersList = this.props.membersList.map((member, index) => { let avatar = member.avatar; - if (member.avatar.length > 0) { + if (member.avatar && member.avatar.length > 0) { avatar = member.avatar.substring(0, member.avatar.length - 1) + '100';// get smaller avatar } else { avatar = siteRoot + 'media/avatars/default.png'; diff --git a/seahub/api2/endpoints/admin/dingtalk.py b/seahub/api2/endpoints/admin/dingtalk.py index c9f90edf22..fda59002b4 100644 --- a/seahub/api2/endpoints/admin/dingtalk.py +++ b/seahub/api2/endpoints/admin/dingtalk.py @@ -379,7 +379,7 @@ class AdminDingtalkDepartmentsImport(APIView): # import api_user for api_user in api_user_list: uid = api_user.get('unionid', '') - api_user['contact_email'] = api_user.get('email') + api_user['contact_email'] = api_user.get('email', '') api_user_name = api_user.get('name') # determine the user exists diff --git a/seahub/api2/endpoints/admin/work_weixin.py b/seahub/api2/endpoints/admin/work_weixin.py index bcc51b0772..14898a47dc 100644 --- a/seahub/api2/endpoints/admin/work_weixin.py +++ b/seahub/api2/endpoints/admin/work_weixin.py @@ -130,7 +130,7 @@ class AdminWorkWeixinDepartmentMembers(APIView): provider=WORK_WEIXIN_PROVIDER, uid__contains=WORK_WEIXIN_UID_PREFIX) for api_user in api_user_list: uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '') - api_user['contact_email'] = api_user['email'] + api_user['contact_email'] = api_user.get('email', '') # # determine the user exists if social_auth_queryset.filter(uid=uid).exists(): api_user['email'] = social_auth_queryset.get(uid=uid).username @@ -410,7 +410,7 @@ class AdminWorkWeixinDepartmentsImport(APIView): # import api_user for api_user in api_user_list: uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '') - api_user['contact_email'] = api_user['email'] + api_user['contact_email'] = api_user.get('email', '') api_user_name = api_user.get('name') # determine the user exists diff --git a/seahub/work_weixin/views.py b/seahub/work_weixin/views.py index 807fea28ba..dd8595515a 100644 --- a/seahub/work_weixin/views.py +++ b/seahub/work_weixin/views.py @@ -123,7 +123,7 @@ def work_weixin_oauth_callback(request): if user_info_api_response_dic: api_user = user_info_api_response_dic api_user['username'] = email - api_user['contact_email'] = api_user['email'] + api_user['contact_email'] = api_user.get('email', '') update_work_weixin_user_info(api_user) if not user.is_active: @@ -217,7 +217,7 @@ def work_weixin_oauth_connect_callback(request): if user_info_api_response_dic: api_user = user_info_api_response_dic api_user['username'] = email - api_user['contact_email'] = api_user['email'] + api_user['contact_email'] = api_user.get('email', '') update_work_weixin_user_info(api_user) # redirect user to page