根据权限查询对应的订单数据

play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java

@@ -6,6 +6,10 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity;
 import com.starry.admin.modules.order.module.vo.*;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService;
+import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
+import com.starry.admin.modules.system.entity.SysRoleEntity;
+import com.starry.admin.modules.system.service.SysRoleService;
+import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.annotation.Log;
 import com.starry.common.context.CustomSecurityContextHolder;
 import com.starry.common.enums.BusinessType;
@@ -29,6 +33,12 @@ public class PlayOrderInfoController {
     @Resource
     private IPlayOrderInfoService orderInfoService;
 
+    @Resource
+    private SysRoleService sysRoleService;
+
+    @Resource
+    private IPlayPersonnelGroupInfoService playPersonnelGroupInfoService;
+
     @Resource
     private IPlayOrderRandomInfoService playOrderRandomInfoService;
 
@@ -38,6 +48,17 @@ public class PlayOrderInfoController {
      */
     @PostMapping("/listByPage")
     public R listByPage(@Validated @RequestBody PlayOrderInfoQueryVo vo) {
+        //查询当前登录用户所有角色信息
+        for (String role : SecurityUtils.getLoginUser().getRoles()) {
+            SysRoleEntity entity = sysRoleService.selectByRoleId(role);
+            if (entity == null) {
+                continue;
+            }
+            //如果当前登录用户的身份是组长
+            if ("leader".equals(entity.getRoleKey())) {
+                vo.setGroupId(playPersonnelGroupInfoService.selectByUserId(SecurityUtils.getUserId()).getId());
+            }
+        }
         return R.ok(orderInfoService.selectOrderInfoPage(vo));
     }
 

play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java

@@ -42,6 +42,7 @@ public class PlayOrderInfoEntity extends BaseEntity<PlayOrderInfoEntity> {
      */
     private String tenantId;
 
+
     /**
      * 订单状态【0:1:2:3:4】
      * 0：已下单（待接单）
@@ -228,6 +229,11 @@ public class PlayOrderInfoEntity extends BaseEntity<PlayOrderInfoEntity> {
      */
     private String acceptBy;
 
+    /**
+     * 订单分组ID（和接单人同一个分组,接单时设置）
+     */
+    private String groupId;
+
     /**
      * 接单时间
      */

play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java

@@ -105,5 +105,10 @@ public class PlayOrderInfoQueryVo extends BasePageEntity {
      */
     private List<String> endOrderTime;
 
+    /**
+     * 分组ID
+     */
+    private String groupId;
+
 
 }

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

@@ -369,6 +369,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
     @Override
     public IPage<PlayOrderInfoReturnVo> selectOrderInfoPage(PlayOrderInfoQueryVo vo) {
         MPJLambdaWrapper<PlayOrderInfoEntity> lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class));
+        if (StringUtils.isNotBlank(vo.getGroupId())) {
+            lambdaQueryWrapper.eq(PlayOrderInfoEntity::getGroupId, vo.getGroupId());
+        }
         if (StringUtils.isNotBlank(vo.getPurchaserBy())) {
             lambdaQueryWrapper.eq(PlayOrderInfoEntity::getPurchaserBy, vo.getPurchaserBy());
         }

play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java

@@ -19,6 +19,13 @@ import java.util.Set;
  */
 public interface SysRoleService extends IService<SysRoleEntity> {
 
+    /**
+     * 根据roleId 查询角色
+     * @param roleId 角色ID
+     * @return 角色
+     */
+    SysRoleEntity selectByRoleId(String roleId);
+
 
     /**
      * 根据roleKey 查询角色

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java

@@ -49,6 +49,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
     private SysUserService userService;
 
 
+    @Override
+    public SysRoleEntity selectByRoleId(String roleId) {
+        LambdaQueryWrapper<SysRoleEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysRoleEntity::getRoleId, roleId);
+        return this.baseMapper.selectOne(lambdaQueryWrapper);
+    }
+
     @Override
     public SysRoleEntity selectByRoleKey(String roleKey) {
         LambdaQueryWrapper<SysRoleEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();