删除学习中心特殊设置扩展

属性

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -612,7 +612,7 @@ public class ExamController extends ControllerSupport {
 				info.setExamId(savedExam.getId());
 
 				List<ExamOrgPropertyEntity> propList = examOrgPropertyRepo
-						.findByexamIdAndOrgId(cur.getExamId(), cur.getOrgId());
+						.findByExamIdAndOrgId(cur.getExamId(), cur.getOrgId());
 
 				Map<String, String> orgProperties = Maps.newHashMap();
 				for (ExamOrgPropertyEntity curOrgProp : propList) {
@@ -903,7 +903,7 @@ public class ExamController extends ControllerSupport {
 			bean.setOrgCode(org.getCode());
 
 			List<ExamOrgPropertyEntity> propList = examOrgPropertyRepo
-					.findByexamIdAndOrgId(next.getExamId(), next.getOrgId());
+					.findByExamIdAndOrgId(next.getExamId(), next.getOrgId());
 
 			Map<String, String> map = Maps.newHashMap();
 			DynamicEnumManager manager = ExamProperty.getDynamicEnumManager();
@@ -1176,6 +1176,9 @@ public class ExamController extends ControllerSupport {
 		for (Long cur : orgSettingsIds) {
 			ExamSpecialSettingsEntity entity = GlobalHelper.getEntity(examSpecialSettingsRepo, cur,
 					ExamSpecialSettingsEntity.class);
+
+			examOrgPropertyRepo.deleteByExamIdAndOrgId(entity.getExamId(), entity.getOrgId());
+
 			examSpecialSettingsRepo.delete(entity);
 			ret.add(entity.getExamId() + ":" + entity.getOrgId());
 		}

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamOrgPropertyRepo.java

@@ -21,8 +21,10 @@ public interface ExamOrgPropertyRepo
 			QueryByExampleExecutor<ExamOrgPropertyEntity>,
 			JpaSpecificationExecutor<ExamOrgPropertyEntity> {
 
-	ExamOrgPropertyEntity findByexamIdAndOrgIdAndKeyId(Long examId, Long orgId, Long keyId);
+	ExamOrgPropertyEntity findByExamIdAndOrgIdAndKeyId(Long examId, Long orgId, Long keyId);
 
-	List<ExamOrgPropertyEntity> findByexamIdAndOrgId(Long examId, Long orgId);
+	List<ExamOrgPropertyEntity> findByExamIdAndOrgId(Long examId, Long orgId);
+
+	void deleteByExamIdAndOrgId(Long examId, Long orgId);
 
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamServiceImpl.java

@@ -372,7 +372,7 @@ public class ExamServiceImpl implements ExamService {
 				} else {
 					value = value.trim();
 				}
-				ExamOrgPropertyEntity entity = examOrgPropertyRepo.findByexamIdAndOrgIdAndKeyId(
+				ExamOrgPropertyEntity entity = examOrgPropertyRepo.findByExamIdAndOrgIdAndKeyId(
 						saved.getExamId(), saved.getOrgId(), de.getId());
 				if (null == entity) {
 					entity = new ExamOrgPropertyEntity();
@@ -396,7 +396,7 @@ public class ExamServiceImpl implements ExamService {
 
 		if (null != orgId) {
 			ExamOrgPropertyEntity examOrgPropertyEntity = examOrgPropertyRepo
-					.findByexamIdAndOrgIdAndKeyId(examId, orgId, de.getId());
+					.findByExamIdAndOrgIdAndKeyId(examId, orgId, de.getId());
 			if (null != examOrgPropertyEntity) {
 				return examOrgPropertyEntity.getValue();
 			}