diff --git a/cclqms-java/src/main/resources/mapper/language/SysLanguageListDao.xml b/cclqms-java/src/main/resources/mapper/language/SysLanguageListDao.xml
index b8f4b2c..412dde7 100644
--- a/cclqms-java/src/main/resources/mapper/language/SysLanguageListDao.xml
+++ b/cclqms-java/src/main/resources/mapper/language/SysLanguageListDao.xml
@@ -10,6 +10,10 @@
         FROM
             sys_language_list sl
                 LEFT JOIN sys_object_language_list sol on (sol.language_id = sl.language_id)
-        WHERE sol.language_code = #{languageCode}
+        <where>
+            <if test="languageCode != null and languageCode != ''">
+                sol.language_code = #{languageCode}
+            </if>
+        </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/cclqms-vue/src/i18n/i18n.js b/cclqms-vue/src/i18n/i18n.js
index 125cc21..16c0b38 100644
--- a/cclqms-vue/src/i18n/i18n.js
+++ b/cclqms-vue/src/i18n/i18n.js
@@ -3,12 +3,24 @@ import Vue from 'vue'
 
 
 Vue.use(VueI18n)
-const supportedLocales = ['cn', 'en']
-let locale = localStorage.getItem('locale') || 'cn'
-if (!supportedLocales.includes(locale)) {
-  locale = 'cn'
-  localStorage.setItem('locale', locale)
+
+const localeAliasMap = {
+  cn: 'cn',
+  'zh-cn': 'cn',
+  'zh_cn': 'cn',
+  en: 'en',
+  'en-us': 'en',
+  'en_us': 'en'
+}
+
+export function normalizeLocale (locale) {
+  const normalizedLocale = (locale || '').toString().trim().toLowerCase()
+  return localeAliasMap[normalizedLocale] || 'cn'
 }
+
+const locale = normalizeLocale(localStorage.getItem('locale'))
+localStorage.setItem('locale', locale)
+
 const i18n = new VueI18n({
   locale: locale,    // 语言标识
   messages: {
diff --git a/cclqms-vue/src/router/index.js b/cclqms-vue/src/router/index.js
index 503540b..35f2991 100644
--- a/cclqms-vue/src/router/index.js
+++ b/cclqms-vue/src/router/index.js
@@ -9,7 +9,7 @@ import Router from 'vue-router'
 import http from '@/utils/httpRequest'
 import { isURL } from '@/utils/validate'
 import { clearLoginInfo } from '@/utils'
-import i18n from '@/i18n/i18n'
+import i18n, { normalizeLocale } from '@/i18n/i18n'
 
 Vue.use(Router)
 
@@ -64,11 +64,16 @@ router.beforeEach((to, from, next) => {
   if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
     next()
   } else {
+    const menuLocale = normalizeLocale(i18n.locale)
+    if (i18n.locale !== menuLocale) {
+      i18n.locale = menuLocale
+      localStorage.setItem('locale', menuLocale)
+    }
     http({
       url: http.adornUrl('/sys/menu/nav'),
       method: 'get',
       params: {
-        'l': i18n.locale, //i18n.locale
+        'l': menuLocale,
         menuType: "pc"
       }
     }).then(({data}) => {
diff --git a/cclqms-vue/src/views/common/login-new.vue b/cclqms-vue/src/views/common/login-new.vue
index 0dbf27e..fd5721a 100644
--- a/cclqms-vue/src/views/common/login-new.vue
+++ b/cclqms-vue/src/views/common/login-new.vue
@@ -73,6 +73,7 @@
 <script>
   import { getUUID } from '@/utils'
   import {getConfigParams} from '@/api/sysConfig.js'
+  import { normalizeLocale } from '@/i18n/i18n'
   export default {
     data () {
       return {
@@ -134,10 +135,11 @@
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
+                const locale = normalizeLocale(data.language)
                 this.$cookie.set('token', data.token)
+                this.$i18n.locale = locale
+                localStorage.setItem('locale', locale)
                 this.$router.replace({ name: 'home' })
-                this.$i18n.locale=data.language
-                localStorage.setItem('locale', data.language)
                 localStorage.setItem('refresh', "0")
                 localStorage.setItem('userName', this.dataForm.userName)
                 this.getConfigParams()
diff --git a/cclqms-vue/src/views/common/login.vue b/cclqms-vue/src/views/common/login.vue
index 0684782..7e5ba72 100644
--- a/cclqms-vue/src/views/common/login.vue
+++ b/cclqms-vue/src/views/common/login.vue
@@ -25,6 +25,7 @@
 <script>
   import { getUUID } from '@/utils'
   import {getConfigParams} from '@/api/sysConfig.js'
+  import { normalizeLocale } from '@/i18n/i18n'
   export default {
     data () {
       return {
@@ -86,10 +87,11 @@
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
+                const locale = normalizeLocale(data.language)
                 this.$cookie.set('token', data.token)
+                this.$i18n.locale = locale
+                localStorage.setItem('locale', locale)
                 this.$router.replace({ name: 'home' })
-                this.$i18n.locale=data.language
-                localStorage.setItem('locale', data.language)
                 localStorage.setItem('refresh', "0")
                 localStorage.setItem('userName', this.dataForm.userName)
                 this.getConfigParams()
diff --git a/cclqms-vue/src/views/main-navbar-update-language.vue b/cclqms-vue/src/views/main-navbar-update-language.vue
index bdf0e73..4a32422 100644
--- a/cclqms-vue/src/views/main-navbar-update-language.vue
+++ b/cclqms-vue/src/views/main-navbar-update-language.vue
@@ -27,6 +27,7 @@
 
 <script>
   import {updateUserLanguage} from '@/api/user.js'
+  import { normalizeLocale } from '@/i18n/i18n'
   // import PubSub from 'pubsub-js'
   import {
     searchSysLanguage
@@ -39,7 +40,7 @@
         dataForm: {
           languageDefault: ''
         },
-        language: localStorage.getItem('locale'),
+        language: normalizeLocale(localStorage.getItem('locale')),
         languageList: []
       }
     },
@@ -58,7 +59,7 @@
         }
       },
       currentLanguageName() {
-        const langCode = this.language === 'en' ? 'en' : 'cn'
+        const langCode = normalizeLocale(this.language)
         return this.$t(`main.languageName.${langCode}`)
       }
     },
@@ -66,7 +67,7 @@
     methods: {
       // 获取多语言列表
       getLanguageList() {
-        searchSysLanguage({ languageCode: this.$i18n.locale}).then(({data}) => {
+        searchSysLanguage({}).then(({data}) => {
           const allowSet = new Set(['cn', 'en', 'zh-CN', 'en-US'])
           this.languageList = (data.rows || []).filter(item => allowSet.has(item.languageCode))
         })
@@ -80,10 +81,13 @@
       },
       // 修改用户默认语言
       dataFormSubmit() {
-        updateUserLanguage(this.dataForm).then(({data}) => {
+        const normalizedLanguage = normalizeLocale(this.dataForm.languageDefault || this.language)
+        updateUserLanguage({ languageDefault: normalizedLanguage }).then(({data}) => {
           if (data.code == 0) {
-            language: localStorage.setItem('locale',this.dataForm.languageDefault)
-            this.$router.go(0);
+            this.$i18n.locale = normalizedLanguage
+            this.language = normalizedLanguage
+            localStorage.setItem('locale', normalizedLanguage)
+            this.$router.go(0)
            // PubSub.publish('search',this.dataForm.languageDefault )
            // this.$router.replace({name: 'login'})
           }