Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8

 src/main/java/com/mindskip/xzs/service/UserService.java

@@ -1,10 +1,12 @@
package com.mindskip.xzs.service;

import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Param;
import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;

import java.util.List;

@@ -132,4 +134,12 @@
    List<User> getUserByLevel(Integer userLevel);

    User getUserByRealName(String realName);

    void setStatus(UserVO user);

    User getUserByExam(ExamPaper examPaper);

    List<Integer> getDeptAdminIds(Integer id);

    List<Department> getDeptAdmins(Integer id);
}