From 8f55b92a5a936d3358bb8a9f2fe67c697ba99be0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 15:09:46 +0800
Subject: [PATCH] bug修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
index 99b35b9..5214c19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java
@@ -23,6 +23,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -67,10 +68,10 @@
     }
 
     /**
-     * 获取检验方法确认单管理列表
+     * 获取检验方法确认单原始检测项分页列表
      */
     //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
-    @ApiOperation(value = "获取检验方法确认单分页列表",  notes = "获取检验方法确认单分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
+    @ApiOperation(value = "获取检验方法确认单原始检测项分页列表",  notes = "获取检验方法确认单原始检测项分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
     @PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
     public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
         TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);
@@ -83,6 +84,9 @@
                 // 查询项目组
                 TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                         .eq(TProjectTeamStaff::getUserId, userId));
+                if(Objects.isNull(projectTeamStaff)){
+                    return R.fail("当前用户未加入项目组,无法进行操作");
+                }
                 // 查询项目的工艺工程师id
                 TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                         .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())

--
Gitblit v1.7.1