From 964dd88319269c16d4ebb99007a954b51e625ef2 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 14 五月 2024 09:41:49 +0800
Subject: [PATCH] 旧数据增删改查，导入导出功能初步完成
---
src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentSiteServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentSiteServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentSiteServiceImpl.java
index cf006ec..14ed85d 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentSiteServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentSiteServiceImpl.java
@@ -19,6 +19,7 @@
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentSiteService;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentSiteTypeService;
import com.gkhy.labRiskManage.domain.riskReport.utils.GetRoleTagUtils;
+import com.gkhy.labRiskManage.domain.riskReport.utils.SearchAuthUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -168,8 +169,10 @@
if (queryParam.getRoom() != null && !queryParam.getRoom().equals("")){
predicateList.add(criteriaBuilder.equal(root.get("room"), queryParam.getRoom()));
}
- if (roleTag == UserTagEnum.USER_TAG_0.getCode()){
- predicateList.add(criteriaBuilder.equal(root.get("createByUserId"),currentUserId));
+ if (SearchAuthUtils.basicSearchAuth() == 1){
+ if (roleTag == UserTagEnum.USER_TAG_0.getCode()){
+ predicateList.add(criteriaBuilder.equal(root.get("createByUserId"), currentUserId));
+ }
}
predicateList.add(criteriaBuilder.equal(root.get("deleteStatus"),StatusEnum.DELETE_NOT.getCode()));
return criteriaBuilder.and(predicateList.toArray(new Predicate[0]));
@@ -324,6 +327,10 @@
int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
List<BasicExperimentSite> basicExperimentSites = new ArrayList<>();
+ if (SearchAuthUtils.basicSearchAuth() == 0){
+ basicExperimentSites = siteRepository.listSite();
+ return BeanCopyUtils.copyBeanList(basicExperimentSites, SiteListDTO.class);
+ }
if (roleTag != UserTagEnum.USER_TAG_0.getCode()){
basicExperimentSites = siteRepository.listSite();
--
Gitblit v1.9.2