Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java

@@ -82,6 +82,7 @@
        TExperimentResultReportQuery query = JSON.parseObject(param, TExperimentResultReportQuery.class);
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if(roleType != 1){
            if(roleType ==2){
                // 查询项目组