From 181675335f506eba85f3edfee5b4d4faea036f50 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Fri, 09 May 2025 14:16:39 +0800
Subject: [PATCH] 增加详情
---
src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentDeviceServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentDeviceServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentDeviceServiceImpl.java
index d116619..9f3afb2 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentDeviceServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/BasicExperimentDeviceServiceImpl.java
@@ -25,6 +25,7 @@
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentDeviceService;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentDeviceTypeService;
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;
@@ -175,7 +176,6 @@
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
-
//组装查询条件
Specification<BasicExperimentDevice> specification = new Specification<BasicExperimentDevice>() {
@Override
@@ -193,8 +193,10 @@
if (deviceQueryBO.getSpecialDevice() != null && !deviceQueryBO.getSpecialDevice().equals("")){
predicateList.add(criteriaBuilder.equal(root.get("specialDevice"), deviceQueryBO.getSpecialDevice()));
}
- 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()));
//返回组装的条件
@@ -363,12 +365,17 @@
int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
List<BasicExperimentDevice> deviceList = new ArrayList<>();
+ if (SearchAuthUtils.basicSearchAuth() == 0){
+ deviceList = basicExperimentDeviceRepository.listDevice();
+ return BeanCopyUtils.copyBeanList(deviceList, BasicExperimentDeviceAppListDTO.class);
+ }
+
+
if (roleTag != UserTagEnum.USER_TAG_0.getCode()){
deviceList = basicExperimentDeviceRepository.listDevice();
}else {
deviceList = basicExperimentDeviceRepository.listDeviceByUserId(currentUserId);
}
-
return BeanCopyUtils.copyBeanList(deviceList, BasicExperimentDeviceAppListDTO.class);
}
--
Gitblit v1.9.2