登录时如果不是部门管理员则deptIds填充为用户所在部门

xiangpei

2024-05-27 13a68df58b3f937db5ba6437c814bafdcd8d37f8

 src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java

@@ -1,6 +1,9 @@
package com.mindskip.xzs.service.impl;

import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.repository.BaseMapper;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.SubjectService;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
@@ -9,17 +12,21 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
public class SubjectServiceImpl extends BaseServiceImpl<Subject> implements SubjectService {

    private final SubjectMapper subjectMapper;
    private final WebContext webContext;
    private final DepartmentMapper departmentMapper;

    @Autowired
    public SubjectServiceImpl(SubjectMapper subjectMapper) {
        super(subjectMapper);
    public SubjectServiceImpl(BaseMapper<Subject> baseMapper, SubjectMapper subjectMapper, WebContext webContext, DepartmentMapper departmentMapper) {
        super(baseMapper);
        this.subjectMapper = subjectMapper;
        this.webContext = webContext;
        this.departmentMapper = departmentMapper;
    }

    @Override
@@ -39,7 +46,13 @@

    @Override
    public List<Subject> allSubject() {
        return subjectMapper.allSubject();
        // 如果是部门管理员，只查关联该部门的课目
        boolean deptAdmin = webContext.isDeptAdmin();
        List<Integer> deptIds = new ArrayList<>();
        if (deptAdmin) {
            deptIds = webContext.getAdminDeptIds();
        }
        return subjectMapper.allSubject(deptIds);
    }

    @Override