...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/ExamSiteController.java

@@ -103,12 +103,18 @@ public class ExamSiteController extends ControllerSupport {
 		Long rootOrgId = accessUser.getRootOrgId();
 
 		String code = domain.getCode();
+		Long orgId = domain.getOrgId();
+
 		if (StringUtils.isBlank(code)) {
 			throw new StatusException("B-620001", "code is blank");
 		}
-		ExamSiteEntity course = examSiteRepo.findByRootOrgIdAndCode(rootOrgId, code);
-		if (null != course) {
-			throw new StatusException("B-620002", "考点代码已被占用");
+		if (null == orgId) {
+			throw new StatusException("B-620002", "orgId is null");
+		}
+
+		ExamSiteEntity es = examSiteRepo.findByOrgIdAndCode(rootOrgId, code);
+		if (null != es) {
+			throw new StatusException("B-620003", "考点代码已被占用");
 		}
 
 		ExamSiteInfo info = new ExamSiteInfo();

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/ExamSiteRepo.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.basic.dao;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
@@ -17,8 +15,6 @@ public interface ExamSiteRepo
 			QueryByExampleExecutor<ExamSiteEntity>,
 			JpaSpecificationExecutor<ExamSiteEntity> {
 
-	List<ExamSiteEntity> findByRootOrgId(Long rootOrgId);
-
-	ExamSiteEntity findByRootOrgIdAndCode(Long rootOrgId, String code);
+	ExamSiteEntity findByOrgIdAndCode(Long orgId, String code);
 
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/ExamSiteEntity.java

@@ -14,8 +14,8 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "EC_B_EXAM_SITE", indexes = {
-		@Index(name = "IDX_B_E_S_003001", columnList = "rootOrgId,code", unique = true),
-		@Index(name = "IDX_B_E_S_003002", columnList = "rootOrgId,name", unique = false)})
+		@Index(name = "IDX_B_E_S_003001", columnList = "orgId,code", unique = true),
+		@Index(name = "IDX_B_E_S_003002", columnList = "orgId,name", unique = false)})
 public class ExamSiteEntity extends JpaEntity {
 	private static final long serialVersionUID = 8042526239290337481L;
 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/ExamSiteServiceImpl.java

@@ -77,7 +77,7 @@ public class ExamSiteServiceImpl implements ExamSiteService {
 
 		} else if (StringUtils.isNotBlank(code)) {
 
-			entity = examSiteRepo.findByRootOrgIdAndCode(rootOrgId, code);
+			entity = examSiteRepo.findByOrgIdAndCode(orgId, code);
 
 			if (null != entity) {
 				if (null == entity.getEnable()) {