diff --git a/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml b/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml index 036cee6..12c690a 100644 --- a/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml +++ b/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml @@ -519,6 +519,7 @@ )s2 on s1.identity_card = s2.identity_card and s1.ruzhi_time = s2.max_time where s1.identity_card = #{identityCard} + ORDER BY scan_time desc LIMIT 1 diff --git a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java index cf0b8d2..e7c28dd 100644 --- a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java +++ b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; @@ -2881,6 +2882,9 @@ public class SsmBaseStaffServiceImpl extends BaseServiceImpl implemen if(StringUtils.isEmpty(memberRequest.getMobilePhone())){ throw new SmsException(ResponseCode.MSG,"请输入手机号!"); } + if(ObjectUtils.isEmpty(passCode)){ + throw new SmsException(ResponseCode.MSG,"请输入验证码"); + } criteria.andEqualTo(StaffRequest.Fields.mobilePhone, memberRequest.getMobilePhone()); criteria.andEqualTo(StaffRequest.Fields.storeId, memberRequest.getStoreId()); List list = blackListDao.selectByExample(example);