From 946ca495daf6dd1409ff81e4de9c230c774a0844 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Fri, 10 Nov 2023 16:20:16 +0800
Subject: [PATCH] 风险等级问题处理，检索条件
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
index 7295182..235f60e 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
@@ -122,7 +122,7 @@
if (ObjectUtils.isEmpty(queryBO.getTag())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR.getCode() ,"查询报告类别参数缺失");
}
- if (queryBO.getExperimentName() == "null"){
+ if (queryBO.getExperimentName() == ""){
queryBO.setExperimentName(null);
}
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
@@ -157,7 +157,7 @@
predicateList.add(criteriaBuilder.equal(root.get("experimentId"),queryParam.getExperimentId()));
}
if (!ObjectUtils.isEmpty(queryParam.getExperimentName())){
- predicateList.add(criteriaBuilder.equal(root.get("experimentName"), queryParam.getExperimentName()));
+ predicateList.add(criteriaBuilder.like(root.get("experimentName"),"%"+queryParam.getExperimentName()+"%"));
}
if (roleTag == UserTagEnum.USER_TAG_0.getCode()){
predicateList.add(criteriaBuilder.equal(root.get("personUserId"), currentUserId));
@@ -165,7 +165,8 @@
if (queryParam.getTag() == 1){
predicateList.add(criteriaBuilder.isNull(root.get("assessPerson")));
}else if (queryParam.getTag() == 2){
- predicateList.add(criteriaBuilder.isNotNull(root.get("assessPerson")));
+ predicateList.add(criteriaBuilder.isNotNull(root.get("assessPerson"))
+ );
}
//现在领导能查看所有的报告
// if (roleTag == UserTagEnum.USER_TAG_2.getCode()){
@@ -555,7 +556,6 @@
reportById.setAssessPerson(reportUpdateBO.getAssessPerson());
reportById.setAssessLevel(reportUpdateBO.getAssessLevel());
-// reportById.setSafeRiskAnalysis(reportUpdateBO.getSafeRiskAnalysis());
reportById.setDescription(reportUpdateBO.getDescription());
reportById.setUpdateTime(LocalDateTime.now());
reportById.setUpdateByUserId(currentUserId);
--
Gitblit v1.9.2