Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/laboratory

xuhy

2 天以前 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4

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

@@ -78,6 +78,7 @@
        // 获取当前用户
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if (roleType != 1){
            query.setUserId(userId);
            if(roleType ==2){