Эх сурвалжийг харах

fix(attendance): 修复获取用户 ID 的逻辑以支持不同数据结构

xieyong 5 өдөр өмнө
parent
commit
d39566b487

+ 2 - 2
src/pages/attendance/index.vue

@@ -285,7 +285,7 @@ async function selectDate(date) {
   selectedDate.value = date;
   selectedDate.value = date;
   try {
   try {
     const user = getCurrentUser() || currentUser || {};
     const user = getCurrentUser() || currentUser || {};
-    const userId = (user && user.raw && user.raw.userId) || (user && user.id) || "";
+    const userId = (user && user.raw && user.raw.userId) || (user && user.raw && user.raw.id) || (user && user.id) || "";
     dailyDetail.value = await queryDailyAttendance(userId, date);
     dailyDetail.value = await queryDailyAttendance(userId, date);
   } catch (error) {
   } catch (error) {
     uni.showToast({ title: error.message || "日期详情加载失败", icon: "none" });
     uni.showToast({ title: error.message || "日期详情加载失败", icon: "none" });
@@ -294,7 +294,7 @@ async function selectDate(date) {
 
 
 async function loadShiftInfo() {
 async function loadShiftInfo() {
   const user = getCurrentUser() || currentUser || {};
   const user = getCurrentUser() || currentUser || {};
-  const userId = (user && user.raw && user.raw.userId) || (user && user.id) || "";
+  const userId = (user && user.raw && user.raw.userId) || (user && user.raw && user.raw.id) || (user && user.id) || "";
   const result = await queryAttendanceRule(userId);
   const result = await queryAttendanceRule(userId);
   ruleStatus.value = result.status;
   ruleStatus.value = result.status;
   ruleBlockedReason.value = result.blockedReason || '';
   ruleBlockedReason.value = result.blockedReason || '';

+ 1 - 1
src/pages/home/index.vue

@@ -215,7 +215,7 @@ async function loadShiftInfo(userId) {
 async function loadDaily() {
 async function loadDaily() {
   try {
   try {
     const user = getCurrentUser() || currentUser || {};
     const user = getCurrentUser() || currentUser || {};
-    const userId = (user && user.raw && user.raw.userId) || (user && user.id) || "";
+    const userId = (user && user.raw && user.raw.userId) || (user && user.raw && user.raw.id) || (user && user.id) || "";
     const date = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, "0")}-${String(new Date().getDate()).padStart(2, "0")}`;
     const date = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, "0")}-${String(new Date().getDate()).padStart(2, "0")}`;
     // 并行:拉 rule + daily(rule 会缓存,daily 每次都拉)
     // 并行:拉 rule + daily(rule 会缓存,daily 每次都拉)
     const [, vo] = await Promise.all([
     const [, vo] = await Promise.all([