1

xieb

2024-01-15 1dca355eb004bf15df3ef88bc7d290e98e5f6e05

 src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java

@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
@@ -103,6 +104,13 @@
//      IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
      assessmentScore.setType(type);
      assessmentScore.setAssessmentTaskId(taskId);

      //增加根据登录用户部门筛选
      boolean isadmin = AuthUtil.isAdmin();
      if (!isadmin) {
         assessmentScore.setDeptId(AuthUtil.getDeptId());
      }

      IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);

      return R.data(AssessmentScoreWrapper.build().pageVO(pages));