|
@@ -68,6 +68,12 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
|
|
|
.eq("clock.delete_flag", 0)
|
|
.eq("clock.delete_flag", 0)
|
|
|
.eq("user.delete_flag", 0)
|
|
.eq("user.delete_flag", 0)
|
|
|
.eq("store.delete_flag", 0)
|
|
.eq("store.delete_flag", 0)
|
|
|
|
|
+ .and(wrapper1 ->
|
|
|
|
|
+ wrapper1.eq("clock.permission", 1)
|
|
|
|
|
+ .or(wSub ->
|
|
|
|
|
+ wSub.eq("clock.permission", 2)
|
|
|
|
|
+ .eq("clock.user_id", userId)
|
|
|
|
|
+ ))
|
|
|
.orderByDesc("created_time"));
|
|
.orderByDesc("created_time"));
|
|
|
storeClockInIPage1.getRecords().forEach(vo -> {
|
|
storeClockInIPage1.getRecords().forEach(vo -> {
|
|
|
if (likeList.contains(String.valueOf(vo.getId()))) {
|
|
if (likeList.contains(String.valueOf(vo.getId()))) {
|
