From 505e5244eeaa4968fc666d3cd12e5a43db20b043 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 16:20:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
index b24a239..953ba3a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
@@ -68,7 +68,9 @@
     @ApiOperation(value = "获取crm业务员管理列表")
     @PostMapping(value = "/list")
     public R<List<TCrmSalesperson>> list() {
-        return R.ok(crmSalespersonService.list(Wrappers.lambdaQuery(TCrmSalesperson.class).orderByDesc(TCrmSalesperson::getCreateTime)));
+        return R.ok(crmSalespersonService.list(Wrappers.lambdaQuery(TCrmSalesperson.class)
+                .eq(TCrmSalesperson::getStatus,1)
+                .orderByDesc(TCrmSalesperson::getCreateTime)));
     }
 
     /**
@@ -138,8 +140,8 @@
     /**
      * 批量删除crm业务员管理
      */
-    @Log(title = "crm业务员管理信息-业务员管理解冻冻结", businessType = BusinessType.DELETE)
-    @ApiOperation(value = "业务员管理解冻冻结")
+    @Log(title = "crm业务员管理信息-业务员管理解冻冻结", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "业务员管理解冻冻结",notes = "状态 1=使用中 2=冻结")
     @PutMapping(value = "/thawOrFreeze")
     public R<Boolean> thawOrFreeze(@RequestParam(value = "id")String id,
                                    @RequestParam(value = "status")Integer status) {

--
Gitblit v1.7.1