16639036659
2024-05-14 964dd88319269c16d4ebb99007a954b51e625ef2
src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
@@ -532,6 +532,14 @@
        ExperimentInfoQueryBO queryBO = pageQuery.getSearchParams();
        UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
        int roleTag = GetRoleTagUtils.GetRoleTagUtils(user);
        // TODO: 2023/11/10
        List<ReportRiskAssessInfo> byLevel = reportRiskAssessInfoRepository.getByLevel(queryBO.getAssessLevel());
        List<Long> ids = new ArrayList<>();
        for (ReportRiskAssessInfo reportRiskAssessInfo : byLevel) {
            ids.add(reportRiskAssessInfo.getExperimentId());
        }
        Specification<ExperimentInfo> specification = new Specification<ExperimentInfo>() {
            @Override
            public Predicate toPredicate(Root<ExperimentInfo> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
@@ -555,7 +563,10 @@
                if (!ObjectUtils.isEmpty(queryBO.getEndTime())){
                    predicateList.add(criteriaBuilder.lessThanOrEqualTo(root.get("createTime"), queryBO.getEndTime()));
                }
                if(roleTag == UserTagEnum.USER_TAG_0.getCode()){  // todo
                if (!ObjectUtils.isEmpty(queryBO.getAssessLevel())){
                    predicateList.add(criteriaBuilder.in(root.get("id")).value(ids));
                }
                if(roleTag == UserTagEnum.USER_TAG_0.getCode()){
                    Join<ExperimentInfo, RiskAssessPlan> experimentJion = root.join("riskAssessPlans", JoinType.LEFT);
                    predicateList.add(criteriaBuilder.or(
                            criteriaBuilder.equal(root.get("liabilityUserId"), currentUserId),