diff --git a/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java b/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java index af1c3f8..c3e2445 100644 --- a/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java @@ -56,6 +56,9 @@ public class SignInRecordServiceImpl extends ServiceImpl() - .lambda() - .eq(SignInRecordDO::getMemberId, signInRecordDO.getMemberId()) - .gt(SignInRecordDO::getSignInDate, LocalDate.now())); - // 存储到缓存到同时保存到数据库 SignInRecordDO sign = this.baseMapper.selectOne(new QueryWrapper() .lambda() @@ -135,7 +133,7 @@ public class SignInRecordServiceImpl extends ServiceImpl() + Integer signCount = signInRecordMapper.selectCount(new QueryWrapper() .lambda() .eq(SignInRecordDO::getMemberId, classMemberMappingDO.getMemberId()) .eq(SignInRecordDO::getClassId, dataViewVO.getClassId())); diff --git a/src/main/resources/mapper/CompanyDictMapper.xml b/src/main/resources/mapper/CompanyDictMapper.xml index 39d4feb..fd74fe5 100644 --- a/src/main/resources/mapper/CompanyDictMapper.xml +++ b/src/main/resources/mapper/CompanyDictMapper.xml @@ -42,10 +42,10 @@ and t2.delete_date is null and t3.delete_date is null - (and t4.role = 1 or t4.role_id = 3) + (and t4.rol_id = 1 or t4.role_id = 3) - (and t4.role = 2) + (and t4.role_id = 2) and t2.id = #{id}