hailin
/
rwadurian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(planting-service): 修复用户ID字段名与JwtAuthGuard一致 

JwtAuthGuard 设置 req.user.id，controller 需要使用相同字段名

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
hailin 2025-12-24 20:50:58 -08:00
parent a7dc85d8e1
commit 8b1db58318
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/services/planting-service/src/api/controllers/contract-signing.controller.ts
View File

@ -47,8 +47,8 @@ export class ContractSigningController {
* 获取用户待签署的合同任务列表 * 获取用户待签署的合同任务列表
*/ */
@Get('pending') @Get('pending')
async getPendingTasks(@Request() req: { user: { userId: string } }) { async getPendingTasks(@Request() req: { user: { id: string } }) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
const tasks = await this.contractSigningService.getPendingTasks(userId); const tasks = await this.contractSigningService.getPendingTasks(userId);
return { return {
success: true, success: true,
@ -61,8 +61,8 @@ export class ContractSigningController {
* 用于App启动时检查 * 用于App启动时检查
*/ */
@Get('unsigned') @Get('unsigned')
async getUnsignedTasks(@Request() req: { user: { userId: string } }) { async getUnsignedTasks(@Request() req: { user: { id: string } }) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
const tasks = await this.contractSigningService.getUnsignedTasks(userId); const tasks = await this.contractSigningService.getUnsignedTasks(userId);
return { return {
success: true, success: true,
@ -76,9 +76,9 @@ export class ContractSigningController {
@Get('tasks/:orderNo') @Get('tasks/:orderNo')
async getTask( async getTask(
@Param('orderNo') orderNo: string, @Param('orderNo') orderNo: string,
@Request() req: { user: { userId: string } }, @Request() req: { user: { id: string } },
) { ) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
const task = await this.contractSigningService.getTask(orderNo, userId); const task = await this.contractSigningService.getTask(orderNo, userId);
if (!task) { if (!task) {
@ -101,9 +101,9 @@ export class ContractSigningController {
@HttpCode(HttpStatus.OK) @HttpCode(HttpStatus.OK)
async markScrollComplete( async markScrollComplete(
@Param('orderNo') orderNo: string, @Param('orderNo') orderNo: string,
@Request() req: { user: { userId: string } }, @Request() req: { user: { id: string } },
) { ) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
try { try {
await this.contractSigningService.markScrollComplete(orderNo, userId); await this.contractSigningService.markScrollComplete(orderNo, userId);
@ -127,9 +127,9 @@ export class ContractSigningController {
@HttpCode(HttpStatus.OK) @HttpCode(HttpStatus.OK)
async acknowledgeContract( async acknowledgeContract(
@Param('orderNo') orderNo: string, @Param('orderNo') orderNo: string,
@Request() req: { user: { userId: string } }, @Request() req: { user: { id: string } },
) { ) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
try { try {
await this.contractSigningService.acknowledgeContract(orderNo, userId); await this.contractSigningService.acknowledgeContract(orderNo, userId);
@ -154,9 +154,9 @@ export class ContractSigningController {
async signContract( async signContract(
@Param('orderNo') orderNo: string, @Param('orderNo') orderNo: string,
@Body() dto: SignContractDto, @Body() dto: SignContractDto,
@Request() req: { user: { userId: string }; ip: string; headers: { 'user-agent'?: string } }, @Request() req: { user: { id: string }; ip: string; headers: { 'user-agent'?: string } },
) { ) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
const ipAddress = req.ip || 'unknown'; const ipAddress = req.ip || 'unknown';
const userAgent = req.headers['user-agent'] || 'unknown'; const userAgent = req.headers['user-agent'] || 'unknown';
@ -195,9 +195,9 @@ export class ContractSigningController {
async lateSignContract( async lateSignContract(
@Param('orderNo') orderNo: string, @Param('orderNo') orderNo: string,
@Body() dto: SignContractDto, @Body() dto: SignContractDto,
@Request() req: { user: { userId: string }; ip: string; headers: { 'user-agent'?: string } }, @Request() req: { user: { id: string }; ip: string; headers: { 'user-agent'?: string } },
) { ) {
const userId = BigInt(req.user.userId); const userId = BigInt(req.user.id);
const ipAddress = req.ip || 'unknown'; const ipAddress = req.ip || 'unknown';
const userAgent = req.headers['user-agent'] || 'unknown'; const userAgent = req.headers['user-agent'] || 'unknown';