diff --git a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java index 67c75f77b..4cab17e88 100644 --- a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java +++ b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java @@ -65,6 +65,7 @@ public interface TrainingDAO extends MyBatisBaseDao and training.name like CONCAT('%',#{trainingName},'%') " + " and user.name like CONCAT('%',#{userName},'%') " + " and user.mobile like CONCAT('%',#{userMobile},'%') " + + " and user.id = #{userId} " + " order by id DESC " + "") Page queryPagedUserTraining(UserTrainingQueryVO queryVO); diff --git a/src/main/java/club/joylink/rtss/dao/UserExamMapper.java b/src/main/java/club/joylink/rtss/dao/UserExamMapper.java index ca1f70c82..42fb271d0 100644 --- a/src/main/java/club/joylink/rtss/dao/UserExamMapper.java +++ b/src/main/java/club/joylink/rtss/dao/UserExamMapper.java @@ -54,6 +54,7 @@ public interface UserExamMapper { " and ue.exam_name like CONCAT('%',#{examName},'%') " + " and user.name like CONCAT('%',#{userName},'%') " + " and user.mobile like CONCAT('%',#{userMobile},'%') " + + " and user.id = #{userId} " + " and ue.result = #{result} " + " order by end_time DESC " + "") diff --git a/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java b/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java index 2dfadd9be..41fbdd2bd 100644 --- a/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -138,6 +139,7 @@ public class VoiceParseServiceImpl implements VoiceParseService { log.error("参数解析配置数据错误,原文:[{}],匹配规则:[{}]",result.getOriginContent(),result.getRule().getKeyWordRules()); throw new BusinessException(BusinessExceptionAssertEnum.VOICE_COMMAND_CONFIG_NULL); } + paramsRules.stream().flatMap(d-> Arrays.stream(d.getIndexArr())).anyMatch(d->groupSize < d); for (ParamExtractRule rule : paramsRules) { String[] originGroupArr = new String[rule.getIndexArr().length]; diff --git a/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java index 8355e7a86..30028bb80 100644 --- a/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java @@ -26,4 +26,7 @@ public class UserExamQueryVO extends PageQueryVO { */ private String result; + private Long userId; + + } diff --git a/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java index 11841cacc..70ad736dc 100644 --- a/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java @@ -31,4 +31,6 @@ public class UserTrainingQueryVO extends PageQueryVO { */ private String trainingName; + private Long userId; + }