fix

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/CopyDataController.java

@@ -25,10 +25,10 @@ public class CopyDataController extends ControllerSupport {
 	//西交大数据复制
 	@GetMapping("data")
 	public void copyData(HttpServletResponse response) {
-		Long fromRootOrgId = 371L;
-		Long toRootOrgId = 21595L;
-//		Long fromRootOrgId = 17283L;
-//		Long toRootOrgId = 17288L;
+//		Long fromRootOrgId = 371L;
+//		Long toRootOrgId = 21595L;
+		Long fromRootOrgId = 141L;
+		Long toRootOrgId = 150L;
 		User user = getAccessUser();
 		if (!user.getRootOrgId().equals(toRootOrgId)) {
 			ServletUtil.returnJson("请求失败，没有权限", response);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/consumer/CopyDataConsumer.java

@@ -296,6 +296,8 @@ public class CopyDataConsumer extends Consumer<CopyDataDto> {
         audio.setCreateTime(new Date());
         audio.setCreateUser(dto.getUser().getDisplayName());
         audio.setOrgId(dto.getToRootOrgId());
+        audio.setCreationBy(dto.getUser().getUserId());
+        audio.setUpdateBy(dto.getUser().getUserId());
         return audio;
     }
 
@@ -312,6 +314,8 @@ public class CopyDataConsumer extends Consumer<CopyDataDto> {
         question.setCreateTime(CommonUtils.getCurDateTime());
         question.setUpdateTime(CommonUtils.getCurDateTime());
         question.setPropertyGroup(null);
+        question.setCreationBy(dto.getUser().getUserId());
+        question.setUpdateBy(dto.getUser().getUserId());
         if (oldQuestion.getHasAudio() == null || !oldQuestion.getHasAudio()) {
             question.setHasAudio(false);
             return question;
@@ -345,6 +349,8 @@ public class CopyDataConsumer extends Consumer<CopyDataDto> {
         detailUnit.setCreator(dto.getUser().getDisplayName());
         detailUnit.setCreateTime(CommonUtils.getCurDateTime());
         detailUnit.setOrgId(dto.getToRootOrgId());
+        detailUnit.setCreationBy(dto.getUser().getUserId());
+        detailUnit.setUpdateBy(dto.getUser().getUserId());
         detailUnit.setPaper(null);
         detailUnit.setPaperDetail(null);
         //复制试题信息
@@ -367,6 +373,8 @@ public class CopyDataConsumer extends Consumer<CopyDataDto> {
         paperDetail.setCreateTime(CommonUtils.getCurDateTime());
         paperDetail.setPaper(null);
         paperDetail.setOrgId(dto.getToRootOrgId());
+        paperDetail.setCreationBy(dto.getUser().getUserId());
+        paperDetail.setUpdateBy(dto.getUser().getUserId());
         return paperDetail;
     }
 
@@ -381,6 +389,8 @@ public class CopyDataConsumer extends Consumer<CopyDataDto> {
         newPaper.setCreateTime(CommonUtils.getCurDateTime());
         newPaper.setLastModifyName(dto.getUser().getDisplayName());
         newPaper.setCreator(dto.getUser().getDisplayName());
+        newPaper.setCreationBy(dto.getUser().getUserId());
+        newPaper.setUpdateBy(dto.getUser().getUserId());
         newPaper.setId(null);
         return newPaper;
     }

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/UserIDAuditorBean.java

@@ -17,12 +17,12 @@ public class UserIDAuditorBean implements AuditorAware<Long> {
     public Optional<Long> getCurrentAuditor() {
     	ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
     	if(requestAttributes==null) {
-    		return Optional.of(-999L);
+    		return Optional.empty();
     	}
     	User accessUser = (User) ServletUtil.getRequest()
                 .getAttribute(HttpServletRequestAttribute.$_ACCESS_USER.name());
         if (null == accessUser) {
-        	return Optional.of(-999L);
+        	return Optional.empty();
         }
         return Optional.of(accessUser.getUserId());
     }