From 86e6fdd16902a45921d255e1f40ba5dc6f115aa6 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 03 四月 2025 10:39:30 +0800
Subject: [PATCH] 逻辑调整
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
index e720259..516f482 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
@@ -372,14 +372,14 @@
Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateUserJoin = root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT);
if (roleTag == UserTagEnum.USER_TAG_0.getCode()) {
-
+ predicateList.add(criteriaBuilder.equal(root.get("planUserId"), currentUserId));
//此处应有谁能查询：辨识专家，评价专家,实验负责人(此处未存相关信息，以实验id为条件查询)
- predicateList.add(criteriaBuilder.or(
- criteriaBuilder.equal(identificationUserJoin.get("identificationUserId"), currentUserId),
- criteriaBuilder.equal(evaluateUserJoin.get("evaluateUserId"), currentUserId),
- criteriaBuilder.in(root.get("experimentId")).value(experimentIdList)
- )
- );
+// predicateList.add(criteriaBuilder.or(
+// criteriaBuilder.equal(identificationUserJoin.get("identificationUserId"), currentUserId),
+// criteriaBuilder.equal(evaluateUserJoin.get("evaluateUserId"), currentUserId),
+// criteriaBuilder.in(root.get("experimentId")).value(experimentIdList)
+// )
+// );
}
query.groupBy(root.get("id"));
predicateList.add(criteriaBuilder.equal(root.get("deleteStatus"), StatusEnum.DELETE_NOT.getCode()));
@@ -1174,6 +1174,7 @@
predicateList.add(criteriaBuilder.equal(root.get("planExecStatus"), queryParam.getPlanExecStatus()));
}
}
+
if (queryParam.getTag() == 2) {
predicateList.add(criteriaBuilder.isNotNull(root.get("identificationTime")));
}
@@ -1188,14 +1189,18 @@
Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateUserJoin = root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT);
Join<RiskAssessPlan, User> planUserJoin = root.join("planUser", JoinType.LEFT);
+
if (roleTag == UserTagEnum.USER_TAG_0.getCode()) {
+ //辨识
+ if (queryParam.getTag() == 1) {
+ predicateList.add(criteriaBuilder.equal(identificationUserJoin.get("identificationUserId"), currentUserId));
+ }
+ //评论
+ if (queryParam.getTag() == 2) {
+ predicateList.add(criteriaBuilder.equal(evaluateUserJoin.get("evaluateUserId"), currentUserId));
+ }
//此处应有谁能查询：辨识专家，评价专家,实验负责人(此处未存相关信息，以实验id为条件查询)
- predicateList.add(criteriaBuilder.or(
- criteriaBuilder.equal(identificationUserJoin.get("identificationUserId"), currentUserId),
- criteriaBuilder.equal(evaluateUserJoin.get("evaluateUserId"), currentUserId),
- criteriaBuilder.in(root.get("experimentId")).value(experimentIdList)
- )
- );
+ //predicateList.add(criteriaBuilder.in(root.get("experimentId")).value(experimentIdList));
// predicateList.add(criteriaBuilder.or(
// criteriaBuilder.equal(root.get("identificationUserId"), currentUserId),
// criteriaBuilder.equal(root.get("evaluateUserId"), currentUserId),
--
Gitblit v1.9.2