From b72086c16e178ea31a865646aeb64bea210e48b7 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 09 五月 2025 14:57:02 +0800
Subject: [PATCH] 修正

---
 src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
index d97874c..d5ab93f 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
@@ -624,17 +624,20 @@
                 if (!ObjectUtils.isEmpty(queryBO.getAssessLevel())){
                     predicateList.add(criteriaBuilder.in(root.get("id")).value(ids));
                 }
-                if(roleTag == UserTagEnum.USER_TAG_0.getCode() || roleTag == UserTagEnum.USER_TAG_1.getCode()){
-                    Join<ExperimentInfo, RiskAssessPlan> experimentJion = root.join("riskAssessPlans", JoinType.LEFT);
-                    //criteriaBuilder.equal(root.get("liabilityUserId"), currentUserId),
-                    predicateList.add(criteriaBuilder.or(
-                            criteriaBuilder.equal(root.get("safeLiabilityUserId"), currentUserId),
-                            criteriaBuilder.equal(experimentJion.get("identificationUserId"), currentUserId),
-                            criteriaBuilder.equal(experimentJion.get("evaluateUserId"), currentUserId))
-                    );
-                    query.groupBy(root.get("id"));
+                if (ObjectUtils.isEmpty(queryBO.getExperimentId())){
+                    if(roleTag == UserTagEnum.USER_TAG_0.getCode() || roleTag == UserTagEnum.USER_TAG_1.getCode()){
+                        Join<ExperimentInfo, RiskAssessPlan> experimentJion = root.join("riskAssessPlans", JoinType.LEFT);
+                        //criteriaBuilder.equal(root.get("liabilityUserId"), currentUserId),
+                        predicateList.add(criteriaBuilder.or(
+                                criteriaBuilder.equal(root.get("safeLiabilityUserId"), currentUserId),
+                                criteriaBuilder.equal(experimentJion.get("identificationUserId"), currentUserId),
+                                criteriaBuilder.equal(experimentJion.get("evaluateUserId"), currentUserId))
+                        );
+                        query.groupBy(root.get("id"));
+                    }
                 }
 
+
                 if (!ObjectUtils.isEmpty(ExperimentTypeEnum.prase(queryBO.getExperimentType()))){
                     Join<ExperimentInfo, ExperimentAndType> typeJoin = root.join("types", JoinType.LEFT);
                     predicateList.add(criteriaBuilder.equal(typeJoin.get("typeId"), queryBO.getExperimentType()));

--
Gitblit v1.9.2