|
@@ -58,7 +58,9 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
|
|
|
getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
|
|
|
GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
|
|
|
OuterGetScoreQueueTopResp resp = new OuterGetScoreQueueTopResp();
|
|
|
- if(getTopExamScoreQueueResp!=null){
|
|
|
+
|
|
|
+ //返回值不为空数据
|
|
|
+ if(!getTopExamScoreQueueResp.getIsEmpty()){
|
|
|
resp.setQueueId(getTopExamScoreQueueResp.getQueueId());
|
|
|
resp.setExamRecordDataId(getTopExamScoreQueueResp.getExamRecordDataId());
|
|
|
Long examId=getTopExamScoreQueueResp.getExamId();
|
|
@@ -74,6 +76,9 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
|
|
|
resp.setExamName(examBean.getName());//考试名称
|
|
|
}
|
|
|
}
|
|
|
+ resp.setIsEmpty(false);//返回的为非空数据
|
|
|
+ }else {
|
|
|
+ resp.setIsEmpty(true);//返回的为空数据
|
|
|
}
|
|
|
return resp;
|
|
|
}
|
|
@@ -90,8 +95,8 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
|
|
|
GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();
|
|
|
getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
|
|
|
GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
|
|
|
-
|
|
|
- if(!getTopExamScoreQueueResp.getQueueId().equals(req.getQueueId())){
|
|
|
+
|
|
|
+ if(getTopExamScoreQueueResp.getQueueId()==null || (getTopExamScoreQueueResp.getQueueId()!=null && !getTopExamScoreQueueResp.getQueueId().equals(req.getQueueId()))){
|
|
|
throw new StatusException("EX-1000003", "queueId is wrong");
|
|
|
}
|
|
|
|