20260905172534

code/fms/fms-vue/src/stores/i18n.js

@@ -41,7 +41,8 @@ export const useI18nStore = defineStore('i18n', () => {
   )
   const langName = computed(
     () => (code) => {
-      const language = languages.value.find((item) => String(item.b_code) === String(code))
+      // s_i18n_type.b_id 即语言编码（字符串业务键）
+      const language = languages.value.find((item) => String(item.b_id) === String(code))
       return language?.b_name || String(code)
     },
   )
@@ -56,7 +57,6 @@ export const useI18nStore = defineStore('i18n', () => {
       .then((res) => {
         languages.value = (res.data || []).map((row) => ({
           b_id: row.b_id,
-          b_code: row.b_code,
           b_name: row.b_name,
           b_canuse: Number(row.b_canuse),
           b_default: Number(row.b_default),

code/fms/fms-vue/src/stores/menus.js

@@ -72,8 +72,8 @@ export const useMenuStore = defineStore('menus', () => {
   function pruneByAccess(nodes) {
     const result = []
     for (const node of nodes) {
-      // 模块管理（菜单编码 module）仅 g3soft 可见
-      if (!isG3soft.value && String(node.b_code || '').toLowerCase() === 'module') continue
+      // 模块管理（菜单主键/编码 module）仅 g3soft 可见
+      if (!isG3soft.value && String(node.b_id || '').toLowerCase() === 'module') continue
       const children = node.children?.length ? pruneByAccess(node.children) : []
       // 目录：没有可访问子菜单时不渲染
       if (node.b_menu_type === 'directory') {

code/fms/fms-vue/src/stores/permissions.js

@@ -21,8 +21,9 @@ export const usePermissionStore = defineStore('permissions', () => {
   let loadingPrincipalKey = ''
   let loadVersion = 0
 
+  // 字符串业务键：模块编码即主键 b_id
   const moduleByCode = computed(
-    () => new Map(modules.value.map((m) => [String(m.b_code || ''), m])),
+    () => new Map(modules.value.map((m) => [String(m.b_id || ''), m])),
   )
   const moduleById = computed(() => new Map(modules.value.map((m) => [String(m.b_id || ''), m])))
   const grantedPageSet = computed(() => new Set(grantedPageIds.value))
@@ -68,17 +69,20 @@ export const usePermissionStore = defineStore('permissions', () => {
       return request
     }
 
-    if (!/^\d+$/.test(userId)) throw new Error('登录用户 ID 无效，请重新登录')
     if (loadedPrincipalKey.value === principalKey) return
     if (loadingPromise && loadingPrincipalKey === principalKey) return loadingPromise
 
     const requestVersion = ++loadVersion
     loadingPrincipalKey = principalKey
+    // 授权表（b_user_module/b_user_power/s_module_power）在部分机构库不存在，
+    // 失败时按无授权处理，不阻塞登录主流程。
+    const failSafe = () => ({ data: [] })
+    const quotedUserId = `N'${String(userId).replaceAll("'", "''")}'`
     const request = Promise.all([
       loadDataApi('s_module', 'b_canuse = 1', 'b_id ASC'),
-      loadDataApi('b_user_module', `b_user_id = ${userId}`, 'b_id ASC'),
-      loadDataApi('b_user_power', `b_user_id = ${userId}`, 'b_id ASC'),
-      loadDataApi('s_module_power', 'b_canuse = 1', 'b_id ASC'),
+      loadDataApi('b_user_module', `b_user_id = ${quotedUserId}`, 'b_id ASC').catch(failSafe),
+      loadDataApi('b_user_power', `b_user_id = ${quotedUserId}`, 'b_id ASC').catch(failSafe),
+      loadDataApi('s_module_power', 'b_canuse = 1', 'b_id ASC').catch(failSafe),
     ])
       .then(([moduleResponse, userModules, userPowers, powers]) => {
         if (requestVersion !== loadVersion) return
@@ -90,13 +94,14 @@ export const usePermissionStore = defineStore('permissions', () => {
           .filter(Boolean)
         modules.value = activeModules
         grantedPageIds.value = pageIds
+        // 模块编码即主键 b_id
         moduleCodes.value = userModules.data
-          .map((item) => mById.get(String(item.b_module_id))?.b_code)
+          .map((item) => mById.get(String(item.b_module_id))?.b_id)
           .filter(Boolean)
         powerCodes.value = userPowers.data
           .map((item) => pById.get(String(item.b_power_id)))
           .filter((p) => Boolean(p))
-          .map((power) => `${String(power.b_module_id)}.${power.b_code}`)
+          .map((power) => `${String(power.b_module_id)}.${power.b_id}`)
         loadedPrincipalKey.value = principalKey
       })
       .finally(() => {