diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java index e039505..dfa3408 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java @@ -14,8 +14,10 @@ import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity; import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleQueryVo; import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleReturnVo; import com.starry.admin.modules.clerk.service.IPlayClerkArticleInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomQueryVo; import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomReturnVo; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -34,6 +36,9 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList); + + IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper); for (PlayClerkArticleReturnVo record : page.getRecords()) { int index = 0; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java index 14ab6fc..1eacf79 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java @@ -261,6 +261,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getClerkId()); } @@ -271,6 +274,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl(vo.getPageNum(), vo.getPageSize()), PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java index ca13cda..3a85b81 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java @@ -12,6 +12,8 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity; import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoQueryVo; import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoReturnVo; import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -34,6 +36,10 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -97,6 +103,9 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkWagesInfoReturnVo.class, lambdaWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java index e4ea0e5..eb10af8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java @@ -16,6 +16,8 @@ import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.module.vo.PlayOrderComplaintQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderComplaintReturnVo; import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -37,6 +39,9 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayOrderComplaintInfoEntity::getClerkId, clerkIdList); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderComplaintReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java index a6f7f84..94ed4b6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java @@ -15,6 +15,8 @@ import com.starry.admin.modules.order.module.vo.PlayOrderContinueQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderContinueReturnVo; import com.starry.admin.modules.order.module.vo.PlayOrderReviewStateEditVo; import com.starry.admin.modules.order.service.IPlayOrderContinueInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.context.CustomSecurityContextHolder; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -22,6 +24,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.List; /** * 订单续单信息Service业务层处理 @@ -34,6 +37,9 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayOrderContinueInfoEntity::getClerkId, clerkIdList); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderContinueReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderEvaluateInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderEvaluateInfoServiceImpl.java index 28b2cd3..c282faf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderEvaluateInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderEvaluateInfoServiceImpl.java @@ -15,6 +15,8 @@ import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo; import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateReturnVo; import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -36,6 +38,9 @@ public class PlayOrderEvaluateInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayOrderEvaluateInfoEntity::getClerkId, clerkIdList); + + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderEvaluateReturnVo.class, lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index 83189d6..5cf8399 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -75,7 +75,6 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList); + return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderRewardReturnVo.class, lambdaQueryWrapper); }