From b6657187eec92ccd148fc3f4d1db97ec8849e240 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 20 六月 2025 21:24:26 +0800
Subject: [PATCH] 菌种库所有代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TStrainReportController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TStrainReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TStrainReportController.java
index 34e70dc..015ac4f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TStrainReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TStrainReportController.java
@@ -20,6 +20,7 @@
 import com.ruoyi.system.query.TTrainLibraryQuery;
 import com.ruoyi.system.service.*;
 import com.ruoyi.system.vo.*;
+import com.tencentcloudapi.tcaplusdb.v20190823.models.IdlFileInfo;
 import io.swagger.annotations.ApiOperation;
 import jdk.nashorn.internal.parser.Token;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,7 +58,6 @@
     private TProjectTeamService projectTeamService;
     @Resource
     private TProjectTeamStaffService projectTeamStaffService;
-    //@PreAuthorize("@ss.hasPermi('system:strainReport:pageListAll')")
     @ApiOperation(value = "菌种报告库分页列表查询",tags = "菌种报告库",response = TStrainReportQuery.class)
     @PostMapping(value = "/api/t-strain-report/pageListAll")
     public R<PageInfo<TStrainReportVO>> pageListAll(@RequestBody String param) {
@@ -104,6 +104,7 @@
                 query.setEvaluateId(strings);
             }
         }
+       query.setEvaluateHumanType(Integer.valueOf(sysUser.getRoleType()));
         return R.ok(strainReportService.pageList(query));
     }
 
@@ -578,7 +579,9 @@
             tStrainReportDetailVO.setEvaluateName(sysUserService.selectUserById(Long.valueOf(strainReport.getEvaluateId())).getNickName());
         }
         if (one.getExperimentId()!=null){
-            tStrainReportDetailVO.setExperimentName(sysUserService.selectUserById(Long.valueOf(one.getExperimentId())).getNickName());
+            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(one.getExperimentId()));
+            tStrainReportDetailVO.setExperimentName(sysUser.getNickName());
+            tStrainReportDetailVO.setExperimentAvatar(sysUser.getAvatar());
             tStrainReportDetailVO.setExperimentId(one.getExperimentId());
         }
         tStrainReportDetailVO.setReportType(strainReport.getReportType());

--
Gitblit v1.7.1