获取当前登录人信息失败，从TrainingUTils 中重新获取当前的登录人信息

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/SubjectServiceImpl.java

@@ -16,9 +16,11 @@ import com.rongwei.training.domain.SubjectOptionsDo;
 import com.rongwei.trainingcommon.sys.dao.*;
 import com.rongwei.trainingcommon.sys.service.SubjectOptionsService;
 import com.rongwei.trainingcommon.sys.service.SubjectService;
+import com.rongwei.trainingcommon.sys.utils.TrainingUtils;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +112,8 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectDao, SubjectDo> imple
             List<SubjectOptionsDo> subjectOptionsDoList =new ArrayList<>();
             SubjectOptionsDo subjectOptionsDo;
             Date date = new Date();
+            SysUserVo currentUser = TrainingUtils.getCurrentUser();
+            log.info("currentUser : {}",currentUser.toString());
             Sheet sheet = new XSSFWorkbook(multipartFile.getInputStream()).getSheetAt(0);
             Row row ;
             int lastRowNum = sheet.getLastRowNum();
@@ -122,14 +126,16 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectDao, SubjectDo> imple
                 subjectDo.setId(SecurityUtil.getUUID());
                 subjectDo.setSubjecttype(TRAINING_SUBJECT_TYPE_IMPOER.getOrDefault(row.getCell(0).getStringCellValue(),"")); //考题类型
                 subjectDo.setSubjectname( row.getCell(1).getStringCellValue());  //考题名称
-                SysUserVo currentUser = JSCommonUtils.getCurrentUser();
-                subjectDo.setTenantid(JSCommonUtils.getCurrentUserFactoryId(currentUser));
+
+                if (currentUser!=null){
+                    subjectDo.setTenantid(JSCommonUtils.getCurrentUserFactoryId(currentUser));
+                    subjectDo.setCreateusername(currentUser.getName());
+                    subjectDo.setCreateuserid(currentUser.getId());
+                    subjectDo.setModifyusername(currentUser.getName());
+                    subjectDo.setModifyuserid(currentUser.getId());
+                }
                 subjectDo.setCreatedate(date);
                 subjectDo.setModifydate(date);
-                subjectDo.setCreateusername(currentUser.getName());
-                subjectDo.setCreateuserid(currentUser.getId());
-                subjectDo.setModifyusername(currentUser.getName());
-                subjectDo.setModifyuserid(currentUser.getId());
                 subjectDoList.add(subjectDo);
 
                 //子表
@@ -146,10 +152,13 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectDao, SubjectDo> imple
                         subjectOptionsDo.setTenantid(subjectDo.getTenantid());
                         subjectOptionsDo.setCreatedate(date);
                         subjectOptionsDo.setModifydate(date);
+                        if (currentUser!=null){
                         subjectOptionsDo.setCreateusername(currentUser.getName());
                         subjectOptionsDo.setCreateuserid(currentUser.getId());
                         subjectOptionsDo.setModifyusername(currentUser.getName());
                         subjectOptionsDo.setModifyuserid(currentUser.getId());
+                        }
+
                         subjectOptionsDoList.add(subjectOptionsDo);
                     }
                 }