fix(stocktake): replace hardcoded 'admin' with actual current user in excel export

This commit is contained in:
DXC
2026-03-27 09:04:13 +08:00
parent b43edc9068
commit b2ce9d31f8
2 changed files with 12 additions and 7 deletions

View File

@ -1,7 +1,7 @@
from flask import Blueprint, jsonify, request, send_file, current_app from flask import Blueprint, jsonify, request, send_file, current_app
from app.extensions import db, beijing_time from app.extensions import db, beijing_time
from datetime import datetime, timedelta from datetime import datetime, timedelta
from flask_jwt_extended import jwt_required from flask_jwt_extended import jwt_required, get_jwt, get_jwt_identity
from app.utils.decorators import permission_required from app.utils.decorators import permission_required
import uuid as uuid_module import uuid as uuid_module
import io import io
@ -32,11 +32,16 @@ except ImportError:
StockProduct = None StockProduct = None
def _normalize_user_id(user_id): def _normalize_user_id(user_id=None):
"""规范化 user_id确保是有效字符串""" """规范化 user_id确保是有效字符串"""
if not user_id or not isinstance(user_id, str) or len(user_id) > 100: # 优先使用传入的 user_id否则从 JWT 获取
return 'admin' if user_id and isinstance(user_id, str) and len(user_id) <= 100:
return user_id.strip() return user_id.strip()
# 从 JWT 获取当前用户
try:
return get_jwt().get('display_name') or get_jwt_identity()
except:
return 'unknown'
def get_stock_model(source_table): def get_stock_model(source_table):
@ -342,7 +347,7 @@ def add_draft():
""" """
try: try:
data = request.json data = request.json
user_id = _normalize_user_id(data.get('user_id', 'admin')) user_id = _normalize_user_id()
uuid = data.get('uuid') uuid = data.get('uuid')
quantity = float(data.get('quantity', 1)) quantity = float(data.get('quantity', 1))
session_id = data.get('session_id') session_id = data.get('session_id')

View File

@ -420,7 +420,7 @@ import request from '@/utils/request'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
const userStore = useUserStore() const userStore = useUserStore()
const currentUser = userStore.username || 'admin' const currentUser = userStore.userInfo?.display_name || userStore.userInfo?.username || userStore.username || '未知用户'
interface StockItem { interface StockItem {
id: number id: number