From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java |   14 ++++++++++++--
 1 files changed, 12 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 c54097b..b0b30c4 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
@@ -68,16 +68,17 @@
     }
 
     /**
-     * 获取检验方法确认单管理列表
+     * 获取检验方法确认单原始检测项分页列表
      */
     //@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);
         // 获取当前用户
         Long userId = tokenService.getLoginUser().getUserId();
         Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+         query.setRoleType(roleType);
         if (roleType != 1){
             query.setUserId(userId);
             if(roleType ==2){
@@ -171,6 +172,15 @@
         return R.ok();
     }
 
+    @Log(title = "检验方法确认单信息-删除检验方法确认单", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "删除检验方法确认单")
+    @PostMapping(value = "/api/t-test-method-confirm-sheet-original/delete")
+    public R<Boolean> delete(@RequestParam String id) {
+        testMethodConfirmSheetOriginalService.removeById(id);
+        testMethodConfirmSheetOriginalDataService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id));
+        return R.ok();
+    }
+
     /**
      * 查看检验方法确认单详情
      */

--
Gitblit v1.7.1