From 964dd88319269c16d4ebb99007a954b51e625ef2 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Tue, 14 May 2024 09:41:49 +0800
Subject: [PATCH] 旧数据增删改查，导入导出功能初步完成
---
src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentStuffServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentStuffServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentStuffServiceImpl.java
index 1ab9b47..310f26a 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentStuffServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentStuffServiceImpl.java
@@ -16,6 +16,7 @@
import com.gkhy.labRiskManage.domain.basic.repository.jpa.BasicExperimentStuffRepository;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentStuffService;
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;
@@ -142,8 +143,10 @@
predicateList.add(criteriaBuilder.equal(root.get("stuffType"), queryParam.getStuffType()));
}
- 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]));
@@ -270,6 +273,12 @@
List<BasicExperimentStuff> listResult = new ArrayList<>();
+ if (SearchAuthUtils.basicSearchAuth() == 0){
+ listResult = stuffRepository.listStuff(currentUserId);
+ return BeanCopyUtils.copyBeanList(listResult, StuffListDTO.class);
+ }
+
+
if (roleTag != UserTagEnum.USER_TAG_0.getCode()){
listResult = stuffRepository.listStuff(currentUserId);
}else {
--
Gitblit v1.9.2