Merge branch 'cherry-pick-2862d95a' into 'release'

修复未设置语言信息时，获取个人语言出错的问题

See merge request o2oa/o2oa!3506

o2web/source/x_desktop/js/base_loader.js

@@ -127,7 +127,7 @@ o2.addReady(function () {
 
         layout.sessionPromise = new Promise(function(resolve, reject){
             o2.Actions.get("x_organization_assemble_authentication").getAuthentication(function (json) {
-                if (json.data.language !== o2.languageName){
+                if (json.data.language && (json.data.language !== o2.languageName)){
                     o2.language = json.data.language.toLowerCase();
                     o2.languageName = json.data.language;
                     var lp = o2.session.path + "/lp/" + o2.language + ".js";