| @@ -81,10 +81,10 @@ public class VoiceMouldController extends BaseController { | |||||
| throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择声纹"); | throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择声纹"); | ||||
| } | } | ||||
| if (null == uvl.getCUserId() ) { | |||||
| if (null == uvl.getUserId() ) { | |||||
| throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择用户"); | throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择用户"); | ||||
| } | } | ||||
| voiceLanguageService.associatedUserVoices(uvl.getVoiceLanguageIdList(), uvl.getCUserId()); | |||||
| voiceLanguageService.associatedUserVoices(uvl.getVoiceLanguageIdList(), uvl.getUserId()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -22,7 +22,7 @@ public class UserVoiceLanguage extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="VocieLanguage编码",name="voiceLanguageId") | @io.swagger.annotations.ApiModelProperty(value="VocieLanguage编码",name="voiceLanguageId") | ||||
| private Long voiceLanguageId; | private Long voiceLanguageId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="WxCuserBasicInfo编码",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="WxCuserBasicInfo编码",name="cUserId") | ||||
| private Long cUserId; | |||||
| private Long userId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| @@ -46,7 +46,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { | |||||
| voiceLanguage.setSortColumns("local asc"); | voiceLanguage.setSortColumns("local asc"); | ||||
| if (null != voiceLanguage.getCUserId()) { | if (null != voiceLanguage.getCUserId()) { | ||||
| UserVoiceLanguage uvl = new UserVoiceLanguage(); | UserVoiceLanguage uvl = new UserVoiceLanguage(); | ||||
| uvl.setCUserId(voiceLanguage.getCUserId()); | |||||
| uvl.setUserId(voiceLanguage.getCUserId()); | |||||
| List<Long> vids = userVoiceLanguageMapper.findVoiceIdList(uvl); | List<Long> vids = userVoiceLanguageMapper.findVoiceIdList(uvl); | ||||
| if (null == vids || vids.size() <= 0) { | if (null == vids || vids.size() <= 0) { | ||||
| List<Long> vvids = new ArrayList<Long>(); | List<Long> vvids = new ArrayList<Long>(); | ||||
| @@ -106,7 +106,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { | |||||
| for (int i = 0 ; i < voicesIds.size() ; i ++) { | for (int i = 0 ; i < voicesIds.size() ; i ++) { | ||||
| UserVoiceLanguage upm = new UserVoiceLanguage(); | UserVoiceLanguage upm = new UserVoiceLanguage(); | ||||
| upm.setId(IdWorker.get().nextId()); | upm.setId(IdWorker.get().nextId()); | ||||
| upm.setCUserId(cUserId); | |||||
| upm.setUserId(cUserId); | |||||
| upm.setVoiceLanguageId(voicesIds.get(i)); | upm.setVoiceLanguageId(voicesIds.get(i)); | ||||
| upm.setCreateDate(new Date()); | upm.setCreateDate(new Date()); | ||||
| upm.setUpdateDate(new Date()); | upm.setUpdateDate(new Date()); | ||||
| @@ -33,7 +33,7 @@ | |||||
| <select id="findMouldIdList" parameterType="com.iformall.domain.po.sm.UserPersonMould" resultType="Long"> | <select id="findMouldIdList" parameterType="com.iformall.domain.po.sm.UserPersonMould" resultType="Long"> | ||||
| select person_mould_id | select person_mould_id | ||||
| from user_person_mould | from user_person_mould | ||||
| <if test=" null != cUserId "> | |||||
| <if test=" null != userId "> | |||||
| where c_user_id = #{userId} | where c_user_id = #{userId} | ||||
| </if> | </if> | ||||
| <if test=" null != cuserIds "> | <if test=" null != cuserIds "> | ||||
| @@ -4,7 +4,7 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.sm.UserVoiceLanguage"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.sm.UserVoiceLanguage"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="voice_language_id" jdbcType="BIGINT" property="voiceLanguageId"/> | <result column="voice_language_id" jdbcType="BIGINT" property="voiceLanguageId"/> | ||||
| <result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> | |||||
| <result column="c_user_id" jdbcType="BIGINT" property="userId" /> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -34,8 +34,8 @@ | |||||
| select voice_language_id | select voice_language_id | ||||
| from user_voice_language | from user_voice_language | ||||
| <if test=" null != cUserId "> | |||||
| where c_user_id = #{cUserId} | |||||
| <if test=" null != userId "> | |||||
| where c_user_id = #{userId} | |||||
| </if> | </if> | ||||
| <if test=" null != cuserIds "> | <if test=" null != cuserIds "> | ||||
| @@ -63,7 +63,7 @@ | |||||
| ( | ( | ||||
| #{item.id}, | #{item.id}, | ||||
| #{item.voiceLanguageId}, | #{item.voiceLanguageId}, | ||||
| #{item.cUserId}, | |||||
| #{item.userId}, | |||||
| #{item.createDate}, | #{item.createDate}, | ||||
| #{item.updateDate} | #{item.updateDate} | ||||
| ) | ) | ||||