From 189849927e37278c8bc03202bd714aca7a0f8f7d Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 10 十二月 2025 11:10:03 +0800
Subject: [PATCH] 修改功能

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java
index 04cace5..ace23ab 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java
+++ b/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("手机号已存在");
@@ -276,6 +278,7 @@
         if(paperStudentList.size()>0){
             trainRecordVOList.addAll(paperStudentList.stream().map(item -> {
                 TrainRecordVO trainRecordVO=new TrainRecordVO();
+                trainRecordVO.setPaperStudentId(item.getId());
                 trainRecordVO.setStudentId(item.getStudentId());
                 trainRecordVO.setTrainType(2);
                 trainRecordVO.setPassed(item.getPassed());
@@ -332,7 +335,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()) ){
@@ -343,8 +346,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("没有权限操作");

--
Gitblit v1.9.2