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/BasicExperimentPersonServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentPersonServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentPersonServiceImpl.java
index 2679d08..590a1e4 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentPersonServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentPersonServiceImpl.java
@@ -20,6 +20,7 @@
import com.gkhy.labRiskManage.domain.basic.repository.jpa.BasicExperimentPersonRepository;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentPersonService;
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;
@@ -157,8 +158,10 @@
if (queryPageParam.getTraining() != null && !queryPageParam.getTraining().equals("")){
predicateList.add(criteriaBuilder.equal(root.get("training"), queryPageParam.getTraining()));
}
- 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]));
@@ -298,6 +301,11 @@
int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
List<BasicExperimentPerson> peopleList = new ArrayList<>();
+ if (SearchAuthUtils.basicSearchAuth() == 0){
+ peopleList = personRepository.listPerson(currentUserId);
+ return BeanCopyUtils.copyBeanList(peopleList, PersonListDTO.class);
+ }
+
if (roleTag != UserTagEnum.USER_TAG_0.getCode()){
peopleList = personRepository.listPerson(currentUserId);
--
Gitblit v1.9.2