From 8ea7230a7350d1d27db1c2ba3119b1c3d50edf51 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Tue, 6 Aug 2024 00:51:15 +0800
Subject: [PATCH] fix

---
 .../clerk/service/impl/PlayClerkUserInfoServiceImpl.java     | 5 ++++-
 .../controller/PlayClerkPerformanceController.java           | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 d8fe617..94c34fd 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
@@ -263,7 +263,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
 
     @Override
     public List<PlayClerkUserInfoEntity> listAll() {
-        return this.baseMapper.selectList(new LambdaQueryWrapper<>());
+        LambdaQueryWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, "1");
+        return this.baseMapper.selectList(lambdaQueryWrapper);
 
     }
 
@@ -307,6 +309,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         if (StrUtil.isNotBlank(vo.getListingState())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
         }
+        lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, "1");
         // 加入组员的筛选
         List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null);
         lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
diff --git a/play-admin/src/main/java/com/starry/admin/modules/statistics/controller/PlayClerkPerformanceController.java b/play-admin/src/main/java/com/starry/admin/modules/statistics/controller/PlayClerkPerformanceController.java
index 4f50d21..1e7fb03 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/statistics/controller/PlayClerkPerformanceController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/statistics/controller/PlayClerkPerformanceController.java
@@ -26,6 +26,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 店员业绩查询对
@@ -64,6 +65,7 @@ public class PlayClerkPerformanceController {
             List<PlayPersonnelGroupInfoEntity> groupInfoEntities = playPersonnelGroupInfoService.selectAll();
             return playClerkPerformanceService.getClerkPerformanceInfo(u, orderInfoEntities, clerkLevelInfoEntity, groupInfoEntities);
         });
+        voPage.setRecords(voPage.getRecords().stream().sorted(Comparator.comparing(PlayClerkPerformanceInfoReturnVo::getOrderNumber).reversed()).collect(Collectors.toList()));
         return R.ok(voPage);
     }