Merge branch 'master_prb_gn' into master_test_gn
commit
11ba70d8bc
|
|
@ -932,7 +932,9 @@ public class ItemLogic {
|
||||||
LOGGER.error("misson为空,activityId:{}",activityId);
|
LOGGER.error("misson为空,activityId:{}",activityId);
|
||||||
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
||||||
}
|
}
|
||||||
ActivityProgressInfo progress = misson.getActivityMissionMap().get(type);
|
Map<Integer, SComposeActivity> integerSComposeActivityMap = SComposeActivity.getConfigMap().get(activityId);
|
||||||
|
int typeId = integerSComposeActivityMap.get(type).getId();
|
||||||
|
ActivityProgressInfo progress = misson.getActivityMissionMap().get(typeId);
|
||||||
if(progress == null){
|
if(progress == null){
|
||||||
LOGGER.error("progress为空,type:{}",type);
|
LOGGER.error("progress为空,type:{}",type);
|
||||||
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue