heheng
2 天以前 c6c31238eb870b5bc9bf0765edd439e9896919da
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java
@@ -118,7 +118,9 @@
    @Override
    public int insertStudent(ExStudent student) {
        SysUser currentUser= SecurityUtils.getLoginUser().getUser();
        student.setCompanyId(currentUser.getCompanyId());
        if (student.getCompanyId()==null){
            student.setCompanyId(currentUser.getCompanyId());
        }
        checkUserAllowed(student);
        if(!checkPhoneUnique(student)){
            throw new ApiException("手机号已存在");
@@ -126,18 +128,18 @@
        if(!checkIdNoUnique(student)){
            throw new ApiException("身份证号已存在");
        }
        if(currentUser.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())){
            if(student.getCreateId()==null){
                throw new ApiException("部门id为空");
            }
        }else if(currentUser.getUserType().equals(UserTypeEnum.DEPART_USER.getCode())){
            student.setCreateId(currentUser.getId());
        }else{//当前用户为车间级用户
            if(currentUser.getParentId()==null){
                throw new ApiException("当前用户部门id为空");
            }
            student.setCreateId(currentUser.getParentId());
        }
//        if(currentUser.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())){
////            if(student.getCreateId()==null){
////                throw new ApiException("部门id为空");
////            }
//        }else if(currentUser.getUserType().equals(UserTypeEnum.DEPART_USER.getCode())){
//            student.setCreateId(currentUser.getId());
//        }else{//当前用户为车间级用户
//            if(currentUser.getParentId()==null){
//                throw new ApiException("当前用户部门id为空");
//            }
//            student.setCreateId(currentUser.getParentId());
//        }
        student.setPassword(SecurityUtils.encryptPassword(Base64.decodeStr(student.getPassword())));
        int row=baseMapper.insert(student);
        if(row<0){
@@ -278,6 +280,8 @@
                TrainRecordVO trainRecordVO=new TrainRecordVO();
                trainRecordVO.setStudentId(item.getStudentId());
                trainRecordVO.setTrainType(2);
                trainRecordVO.setPassed(item.getPassed());
                trainRecordVO.setNumber(item.getNumber());
                trainRecordVO.setName(item.getExamPaper().getName());
                trainRecordVO.setCreateTime(item.getCreateTime());
                trainRecordVO.setCompanyId(item.getCompanyId());
@@ -330,7 +334,7 @@
    public void checkUserAllowed(ExStudent student) {
        SysUser currentUser= SecurityUtils.getLoginUser().getUser();
        if(student.getId()!=null){
            if(currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
            if(currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) || currentUser.getUserType().equals(UserTypeEnum.COMPANY_ADMIN.getCode())){
                return;
            }
            if(currentUser.getUserType().equals(UserTypeEnum.STUDENT.getCode()) ){
@@ -341,8 +345,8 @@
                }
            }
        }else{
            if(currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
                throw new ApiException("系统管理员没有权限操作");
            if(currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) || currentUser.getUserType().equals(UserTypeEnum.COMPANY_ADMIN.getCode())){
                return;
            }
            if(currentUser.getUserType().equals(UserTypeEnum.STUDENT.getCode())){
                throw new ApiException("没有权限操作");