fix

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<PlayClerkArticl
     @Resource
     private PlayClerkArticleInfoMapper playClerkArticleInfoMapper;
 
+    @Resource
+    private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
+
     /**
      * 查询店员动态信息
      *
@@ -76,6 +81,11 @@ public class PlayClerkArticleInfoServiceImpl extends ServiceImpl<PlayClerkArticl
         if (vo.getReleaseTime() != null && vo.getReleaseTime().size() == 2) {
             lambdaQueryWrapper.between(PlayClerkArticleInfoEntity::getReleaseTime, vo.getReleaseTime().get(0), vo.getReleaseTime().get(1));
         }
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaQueryWrapper.in(PlayClerkArticleInfoEntity::getClerkId, clerkIdList);
+
+
         IPage<PlayClerkArticleReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
         for (PlayClerkArticleReturnVo record : page.getRecords()) {
             int index = 0;

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java

@@ -261,6 +261,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         // 查询所有店员
         lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getId, "clerkId");
         lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, "1");
+        // 加入组员的筛选
+        List<String> 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<PlayClerkUserInfoM
         lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayClerkUnsettledWagesInfoReturnVo::getOrderInfoEntities);
         lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy, PlayClerkUserInfoEntity::getId);
         lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, "0");
+
+
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper);
     }
 

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<PlayClerkWagesInf
     private PlayClerkWagesInfoMapper playClerkWagesInfoMapper;
 
 
+    @Resource
+    private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
+
+
     @Override
     public PlayClerkWagesInfoEntity selectCurrentPeriodWagesByClerkId(String clerkId) {
         LambdaQueryWrapper<PlayClerkWagesInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -97,6 +103,9 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl<PlayClerkWagesInf
             lambdaWrapper.eq(PlayClerkWagesInfoEntity::getSettlementDate, LocalDate.parse(vo.getSettlementDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         }
         lambdaWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "1");
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkWagesInfoReturnVo.class, lambdaWrapper);
     }
 

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<PlayOrderComp
     @Resource
     private PlayOrderInfoServiceImpl playOrderInfoService;
 
+    @Resource
+    private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
+
 
 
     /**
@@ -103,6 +108,10 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl<PlayOrderComp
         if (vo.getComplaintTime() != null && vo.getComplaintTime().size() == 2) {
             lambdaQueryWrapper.between(PlayOrderComplaintInfoEntity::getComplaintTime, vo.getComplaintTime().get(0), vo.getComplaintTime().get(1));
         }
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaQueryWrapper.in(PlayOrderComplaintInfoEntity::getClerkId, clerkIdList);
+
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderComplaintReturnVo.class, lambdaQueryWrapper);
     }
 

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<PlayOrderConti
     @Resource
     private PlayOrderContinueInfoMapper playOrderContinueInfoMapper;
 
+    @Resource
+    private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
+
 
     @Override
     public PlayOrderContinueInfoEntity selectPlayOrderId(String orderId) {
@@ -98,6 +104,10 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl<PlayOrderConti
         if (vo.getContinueTime() != null && vo.getContinueTime().size() == 2) {
             lambdaQueryWrapper.between(PlayOrderContinueInfoEntity::getContinueTime, vo.getContinueTime().get(0), vo.getContinueTime().get(1));
         }
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaQueryWrapper.in(PlayOrderContinueInfoEntity::getClerkId, clerkIdList);
+
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderContinueReturnVo.class, lambdaQueryWrapper);
     }
 

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<PlayOrderEvalu
     @Resource
     private PlayOrderInfoServiceImpl playOrderInfoService;
 
+    @Resource
+    private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
+
 
     @Override
     public PlayOrderEvaluateInfoEntity queryCustomToOrderEvaluateInfo(String customId, String orderId) {
@@ -110,6 +115,11 @@ public class PlayOrderEvaluateInfoServiceImpl extends ServiceImpl<PlayOrderEvalu
         if (vo.getEvaluateTime() != null && vo.getEvaluateTime().size() == 2) {
             lambdaQueryWrapper.between(PlayOrderEvaluateInfoEntity::getEvaluateTime, vo.getEvaluateTime().get(0), vo.getEvaluateTime().get(1));
         }
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaQueryWrapper.in(PlayOrderEvaluateInfoEntity::getClerkId, clerkIdList);
+
+
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderEvaluateReturnVo.class, lambdaQueryWrapper);
     }
 

play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java

@@ -75,7 +75,6 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
     @Resource
     private IPlayOrderComplaintInfoService playOrderComplaintInfoService;
 
-
     @Resource
     private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
 
@@ -310,6 +309,10 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
             lambdaQueryWrapper.between(PlayOrderInfoEntity::getPurchaserTime, vo.getPurchaserTime().get(0), vo.getPurchaserTime().get(1));
         }
         lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getPurchaserTime);
+        // 加入组员的筛选
+        List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
+        lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList);
+
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderRewardReturnVo.class, lambdaQueryWrapper);
 
     }