From 3dc3a8b80a57fdc47ff65c016f48dbf33f60dfb7 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 27 Nov 2020 11:37:33 +0800 Subject: [PATCH] 20201127v1.3 --- .../main/java/com/ccsens/mt/api/CompeteVideoController.java | 4 ++-- mt/src/main/resources/mapper_dao/CompeteVideoDao.xml | 4 ++-- tall/src/main/java/com/ccsens/tall/service/UserService.java | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index 8b61d6a4..5a625f40 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -66,10 +66,10 @@ public class CompeteVideoController { return JsonResponse.newInstance().ok(peoSignStatus); } @MustLogin - @ApiOperation(value = "查看教练签到状态（签到用）", notes = "Mr.王---------查看教练的人的签到状态") + @ApiOperation(value = "查看裁判签到状态（签到用）", notes = "Mr.王---------查看教练的人的签到状态") @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看教练签到状态（签到用）:{}",params); + log.info("查看裁判签到状态（签到用）:{}",params); PageInfo coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); return JsonResponse.newInstance().ok(coachSignStatus); } diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 47ac4744..8c17e5ee 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -68,7 +68,7 @@ tt.`cr` as `time` FROM t_compete_judgment tcj - left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id + left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id and ttpm.user_id != 0 left join ( select @@ -76,7 +76,7 @@ user_id From tall.t_sys_log - where `url`='/users/signin' and `rec_status`=0 + where `url`='/users/signin' and `rec_status`=0 and user_id != 0 and tall.t_sys_log.created_at <= #{param.signEndTime,jdbcType=TIMESTAMP} diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 540bd4e2..11986631 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -333,6 +333,9 @@ public class UserService implements IUserService { userSignVo = new UserVo.UserSign(); userSignVo.setUserId(theAuth.getUserId()); userSignVo.setAuthId(theAuth.getId()); + + //给所有手机号一样的角色添加userId + memberHandler(theAuth.getUserId(), phone); } else { throw new BaseException(CodeEnum.SMS_CODE_CORRECT); }