修正

heheng

2025-05-09 b72086c16e178ea31a865646aeb64bea210e48b7

修正

 src/main/java/com/gkhy/labRiskManage/application/experiment/dto/bo/ExperimentInfoAppQueryBO.java

@@ -17,5 +17,6 @@
    private Byte experimentType;
    private String experimentName;
    private Byte assessLevel;
    private Long experimentId;

}

 src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java

@@ -624,17 +624,20 @@
                if (!ObjectUtils.isEmpty(queryBO.getAssessLevel())){
                    predicateList.add(criteriaBuilder.in(root.get("id")).value(ids));
                }
                if(roleTag == UserTagEnum.USER_TAG_0.getCode() || roleTag == UserTagEnum.USER_TAG_1.getCode()){
                    Join<ExperimentInfo, RiskAssessPlan> experimentJion = root.join("riskAssessPlans", JoinType.LEFT);
                    //criteriaBuilder.equal(root.get("liabilityUserId"), currentUserId),
                    predicateList.add(criteriaBuilder.or(
                            criteriaBuilder.equal(root.get("safeLiabilityUserId"), currentUserId),
                            criteriaBuilder.equal(experimentJion.get("identificationUserId"), currentUserId),
                            criteriaBuilder.equal(experimentJion.get("evaluateUserId"), currentUserId))
                    );
                    query.groupBy(root.get("id"));
                if (ObjectUtils.isEmpty(queryBO.getExperimentId())){
                    if(roleTag == UserTagEnum.USER_TAG_0.getCode() || roleTag == UserTagEnum.USER_TAG_1.getCode()){
                        Join<ExperimentInfo, RiskAssessPlan> experimentJion = root.join("riskAssessPlans", JoinType.LEFT);
                        //criteriaBuilder.equal(root.get("liabilityUserId"), currentUserId),
                        predicateList.add(criteriaBuilder.or(
                                criteriaBuilder.equal(root.get("safeLiabilityUserId"), currentUserId),
                                criteriaBuilder.equal(experimentJion.get("identificationUserId"), currentUserId),
                                criteriaBuilder.equal(experimentJion.get("evaluateUserId"), currentUserId))
                        );
                        query.groupBy(root.get("id"));
                    }
                }


                if (!ObjectUtils.isEmpty(ExperimentTypeEnum.prase(queryBO.getExperimentType()))){
                    Join<ExperimentInfo, ExperimentAndType> typeJoin = root.join("types", JoinType.LEFT);
                    predicateList.add(criteriaBuilder.equal(typeJoin.get("typeId"), queryBO.getExperimentType()));