|
|
@@ -2031,9 +2031,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
List<StoreStaffConfig> storeStaffConfigs = storeStaffConfigMapper.selectList(lambdaQueryWrapper);
|
|
|
result.setEmployeeList(storeStaffConfigs);
|
|
|
|
|
|
- // 该用户的打卡记录
|
|
|
+ // 该用户的打卡记录(仅审核通过 check_flag=2,未审核/审核中/拒绝均不计入)
|
|
|
LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
|
|
|
clockInWrapper.eq(StoreClockIn::getUserId, userId);
|
|
|
+ clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
|
|
|
List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
|
|
|
|
|
|
List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());
|
|
|
@@ -5991,9 +5992,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
result.setIsFollowed(0); // 用户ID或店铺信息为空,默认未关注
|
|
|
}
|
|
|
|
|
|
- // 该用户的打卡记录
|
|
|
+ // 该用户的打卡记录(仅审核通过 check_flag=2)
|
|
|
LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
|
|
|
clockInWrapper.eq(StoreClockIn::getUserId, userId);
|
|
|
+ clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
|
|
|
List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
|
|
|
|
|
|
List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());
|