From 80de65731f2780e35677f3a797c8f6305e3e5d88 Mon Sep 17 00:00:00 2001
From: huchuansai <huchuansai@foxmail.com>
Date: Mon, 27 Oct 2025 18:12:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=97=E5=91=98=E7=AD=9B=E9=80=89for?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlayClerkUserInfoServiceImpl.java        |  6 ++++++
 .../WxPersonnelGroupInfoController.java           | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

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 2e231e0..49e2851 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
@@ -380,6 +380,12 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         if (StrUtil.isNotBlank(vo.getLevelId())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getLevelId, vo.getLevelId());
         }
+        if (StrUtil.isNotBlank(vo.getListingState())) {
+            lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
+        }
+        if (StrUtil.isNotBlank(vo.getRandomOrderState())) {
+            lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getRandomOrderState, vo.getRandomOrderState());
+        }
         if (StrUtil.isNotBlank(vo.getProvince())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getProvince, vo.getProvince());
         }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java
index 7d4a432..e9d9467 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java
@@ -16,10 +16,7 @@ import java.util.List;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 微信查询组长工资
@@ -56,4 +53,14 @@ public class WxPersonnelGroupInfoController {
         return R.ok(data);
     }
 
+    @ApiOperation(value = "查询分组信息", notes = "获取所有店员分组")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "操作成功", response = PlayPersonnelGroupInfoEntity.class, responseContainer = "List")})
+    @ClerkUserLogin
+    @GetMapping("/group/listAll")
+    public R findAllGroup() {
+        List<PlayPersonnelGroupInfoEntity> list = playClerkGroupInfoService.selectAll();
+        return R.ok(list);
+    }
+
 }