java/laboratory.git

			@@ -285,11 +285,12 @@
			TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
			SysUser sysUser = sysUserService.selectUserById(loginUser.getUser().getUserId());
			if (sysUser.getRoleType() != 1) {
			List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
			List<String> teamIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
			.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
			if (collect.isEmpty()) {
			if (teamIds.isEmpty()) {
			return R.ok(new PageInfo<>());
			}
			query.setTeamIds(teamIds);
			}
			return R.ok(tResultWorkEvaluateService.pageList(query));
			}

			@@ -4,10 +4,13 @@
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.security.core.Authentication;
			import org.springframework.security.core.context.SecurityContextHolder;
			import org.springframework.security.core.token.TokenService;
			import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
			import com.ruoyi.common.constant.HttpStatus;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.exception.ServiceException;

			import javax.annotation.Resource;

			/**
			* 安全服务工具类
			@@ -17,6 +20,7 @@
			@Slf4j
			public class SecurityUtils
			{

			/**
			* 用户ID
			**/

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史