...

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

@@ -396,8 +396,8 @@ public class ExamController extends ControllerSupport {
 	 * @return
 	 */
 	@ApiOperation(value = "查询考生考试批次单个属性")
-	@GetMapping("studentOrgProperty/{examId}/{key}")
-	public String getStudentOrgProperty(@PathVariable Long examId, @PathVariable String key) {
+	@GetMapping("examOrgProperty/{examId}/{key}")
+	public String getExamOrgProperty(@PathVariable Long examId, @PathVariable String key) {
 		User accessUser = getAccessUser();
 		ExamEntity examEntity = examRepo.findOne(examId);
 		if (null == examEntity) {

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

@@ -179,21 +179,13 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 	@Override
 	public GetExamPropertyResp getExamProperty(@RequestBody GetExamPropertyReq req) {
 		Long examId = req.getExamId();
+		Long orgId = req.getOrgId();
 		String key = req.getKey();
 
-		ExamProperty prop = ExamProperty.valueOf(key);
-
-		ExamPropertyEntity entity = examPropertyRepo.findByexamIdAndKeyId(examId, prop.getKeyId());
+		String value = examService.getOrgProperty(examId, orgId, key);
 
 		GetExamPropertyResp resp = new GetExamPropertyResp();
-		if (null != entity) {
-			resp.setExisting(true);
-			resp.setKey(key);
-			resp.setPropertyId(entity.getId());
-			resp.setValue(entity.getValue());
-		} else {
-			resp.setExisting(false);
-		}
+		resp.setValue(value);
 		return resp;
 	}
 

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

@@ -20,8 +20,8 @@ import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgSettingsRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamPropertyRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
-import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgPropertyEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamPropertyEntity;
 import cn.com.qmth.examcloud.core.examwork.service.ExamService;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamInfo;
@@ -246,10 +246,12 @@ public class ExamServiceImpl implements ExamService {
 	public String getOrgProperty(Long examId, Long orgId, String key) {
 		ExamProperty ep = ExamProperty.valueOf(key);
 
-		ExamOrgPropertyEntity examOrgPropertyEntity = examOrgPropertyRepo
-				.findByexamIdAndOrgIdAndKeyId(examId, orgId, ep.getKeyId());
-		if (null != examOrgPropertyEntity) {
-			return examOrgPropertyEntity.getValue();
+		if (null != orgId) {
+			ExamOrgPropertyEntity examOrgPropertyEntity = examOrgPropertyRepo
+					.findByexamIdAndOrgIdAndKeyId(examId, orgId, ep.getKeyId());
+			if (null != examOrgPropertyEntity) {
+				return examOrgPropertyEntity.getValue();
+			}
 		}
 
 		ExamPropertyEntity examPropertyEntity = examPropertyRepo.findByexamIdAndKeyId(examId,