fix(core):自动登录后语言代码正确

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -44,6 +44,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cn.estsh.i3plus.platform.common.util.CommonConstWords.DEFAULT_LANGUAGE;
+
 /**
  * @Description :
  * @Reference :
@@ -139,7 +141,6 @@ public class WhiteController extends CoreBaseController {
     }
 
     /**
-     *
      * @return
      */
     @GetMapping(value = "/auth/logout")
@@ -169,6 +170,11 @@ public class WhiteController extends CoreBaseController {
 
         try {
             ValidatorBean.checkNotNull(languageCode, "语言不能为空");
+            // TODO 后期移除，暂时用于避免自动登录后前台没有正确的传输组织代码信息
+            if ("null".equals(languageCode)) {
+                languageCode = DEFAULT_LANGUAGE;
+            }
+
             // 设置语言代码
             BaseThreadLocal.setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
 
@@ -322,7 +328,6 @@ public class WhiteController extends CoreBaseController {
     }
 
 
-
     @GetMapping(value = "/find-language-code-soft-type")
     @ApiOperation(value = "根据语言代码查询资源")
     public ResultBean findSysLocaleResourceByLanguageCode(String languageCode, Integer softType,
@@ -350,7 +355,8 @@ public class WhiteController extends CoreBaseController {
 
             if (needPlatformRes.intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
                 Map<Object, Object> platformResMap =
-                        redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + CommonEnumUtil.SOFT_TYPE.IMPP.getValue());;
+                        redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + CommonEnumUtil.SOFT_TYPE.IMPP.getValue());
+                ;
                 resourceMap.putAll(platformResMap);
             }
 
@@ -405,6 +411,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 根据文件代码查询文件信息
+     *
      * @param fileCode 文件代码
      * @return 处理结果
      */
@@ -526,13 +533,15 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 查询全部打印模板
+     *
      * @return 处理结果
      */
     @PostMapping(value = "/sys-label-template/list")
     @ApiOperation(value = "查询全部打印模板", notes = "查询全部打印模板")
     public ResultBean<SysLabelTemplate> findSysConfigAll(@RequestBody SysLabelTemplate template) {
         try {
-            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);;
+            List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);
+            ;
             return ResultBean.success("操作成功")
                     .setResultList(sysLabelTemplateList)
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -545,6 +554,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 查询未翻译的资源
+     *
      * @return 处理结果
      */
     @PostMapping(value = "/locale-resource/no-resource")
@@ -587,6 +597,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 缺失资源
+     *
      * @param key
      * @param menuCode
      * @return
@@ -670,6 +681,7 @@ public class WhiteController extends CoreBaseController {
     /********************************************SWEB所需接口*******************************************/
     /**
      * 添加用户信息
+     *
      * @param model 用户信息
      * @return 处理结果
      */
@@ -681,6 +693,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 修改用户信息
+     *
      * @param model 用户信息
      * @return 处理结果
      */
@@ -692,6 +705,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 删除用户信息
+     *
      * @param id 用户id
      * @return 处理结果
      */
@@ -703,6 +717,7 @@ public class WhiteController extends CoreBaseController {
 
     /**
      * 查询用户信息
+     *
      * @param cloudPagerModel 查询条件
      * @return 处理结果
      */