diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 190a7e0..1fb5191 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -150,36 +150,38 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"暂不支持声音模板交叉选择"); } Long voiceMouldId = record.getVoiceMouldIds().get(0); - VoiceMould voiceMould = voiceMouldService.getById(voiceMouldId); - if(voiceMould == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息"); - } - record.setLanguages(voiceMould.getLanguages()); - if(voiceMould.getParentId().equals(0L)){ - record.setVoiceMouldId(voiceMould.getId()); - }else{ - record.setVoiceMouldId(voiceMould.getParentId()); - } - JSONObject voiceMouldObject = new JSONObject(); - voiceMouldObject.put("title",voiceMould.getTitle()); - voiceMouldObject.put("languages",voiceMould.getLanguages()); - voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); - voiceMouldObject.put("personId",0l); - voiceMouldObject.put("personType",0); - voiceMouldObject.put("personTypeStr","默认"); - voiceMouldObject.put("speakId",0l); - voiceMouldObject.put("speakType",0); - voiceMouldObject.put("speakTypeStr","默认"); - if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ - voiceMouldObject.put("personId",voiceMould.getId()); - voiceMouldObject.put("personType",voiceMould.getPersonType()); - voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr()); - }else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){ - voiceMouldObject.put("speakId",voiceMould.getId()); - voiceMouldObject.put("speakType",voiceMould.getPersonType()); - voiceMouldObject.put("speakTypeStr",voiceMould.getSpeakTypeStr()); + if(voiceMouldId != null){ + VoiceMould voiceMould = voiceMouldService.getById(voiceMouldId); + if(voiceMould == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息"); + } + record.setLanguages(voiceMould.getLanguages()); + if(voiceMould.getParentId().equals(0L)){ + record.setVoiceMouldId(voiceMould.getId()); + }else{ + record.setVoiceMouldId(voiceMould.getParentId()); + } + JSONObject voiceMouldObject = new JSONObject(); + voiceMouldObject.put("title",voiceMould.getTitle()); + voiceMouldObject.put("languages",voiceMould.getLanguages()); + voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); + voiceMouldObject.put("personId",0l); + voiceMouldObject.put("personType",0); + voiceMouldObject.put("personTypeStr","默认"); + voiceMouldObject.put("speakId",0l); + voiceMouldObject.put("speakType",0); + voiceMouldObject.put("speakTypeStr","默认"); + if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ + voiceMouldObject.put("personId",voiceMould.getId()); + voiceMouldObject.put("personType",voiceMould.getPersonType()); + voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr()); + }else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){ + voiceMouldObject.put("speakId",voiceMould.getId()); + voiceMouldObject.put("speakType",voiceMould.getPersonType()); + voiceMouldObject.put("speakTypeStr",voiceMould.getSpeakTypeStr()); + } + record.setVoiceMouldSm(voiceMouldObject.toJSONString()); } - record.setVoiceMouldSm(voiceMouldObject.toJSONString()); } if(record.getBackgroundId() != null){ MaterialMould background = materialMouldService.getById(record.getBackgroundId());