Ver código fonte

Jenkins后端报错修改

weiwenhai 6 anos atrás
pai
commit
04eaed3e44

+ 0 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/ImportPaperController.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.service.core.api;
 
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.questions.base.exception.PaperException;
 import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;

+ 0 - 3
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigProviderServiceImpl.java

@@ -18,13 +18,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
-import com.netflix.infix.lang.infix.antlr.EventFilterParser.boolean_expr_return;
-
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.question.PaperDto;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.AudioTimeConfigRepo;
 import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;

+ 1 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -51,7 +51,6 @@ import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 
 import com.google.gson.Gson;
-import com.netflix.infix.lang.infix.antlr.EventFilterParser.null_predicate_return;
 
 import cn.com.qmth.examcloud.core.questions.dao.ExamPaperRepo;
 import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
@@ -1318,7 +1317,7 @@ public class PaperServiceImpl implements PaperService{
 		//查询原paper对象
 		Paper paper = paperRepo.findOne(paperId);
 		CoursePaperDto coursePaperDto = new CoursePaperDto();
-		coursePaperDto.setOrgId(user.getOrgId());
+		coursePaperDto.setOrgId(user.getRootOrgId());
 		coursePaperDto.setPaperId(paper.getId());
 		coursePaperDto.setPaperName(paper.getName());
 		coursePaperDto.setExamId(Long.parseLong(examId));

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuestionProviderServiceImpl.java

@@ -49,7 +49,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 	@Override
 	public String save(DefaultQuestion defaultQuestion) {
 		Question question = new Question();
-		if(StringUtils.isBlank(defaultQuestion.getId())){
+		if(!StringUtils.isBlank(defaultQuestion.getId())){
 			question.setId(defaultQuestion.getId());
 		}
 		question.setOrgId(defaultQuestion.getRootOrgId().toString());

+ 0 - 2
pom.xml

@@ -13,8 +13,6 @@
 	<modules>
 		<module>examcloud-core-questions-base</module>
 		<module>examcloud-core-questions-starter</module>
-		<module>examcloud-core-questions-api</module>
-		<module>examcloud-core-questions-api-client</module>
 		<module>examcloud-core-questions-api-provider</module>
 		<module>examcloud-core-questions-dao</module>
 		<module>examcloud-core-questions-service</module>