From 3f4b903f89aedfdd2bc7963be5b496325c9fe553 Mon Sep 17 00:00:00 2001
From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 15:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=99=BB=E9=99=86=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PsCustomController.java         |  3 ++-
 .../business/controller/PsHomeController.java  | 18 +++++++++---------
 .../business/service/IPsCustomInfoService.java |  3 ++-
 .../service/impl/PsCustomInfoServiceImpl.java  | 15 ++++++++++++---
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
index a1054f8..28ac241 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
@@ -1,6 +1,7 @@
 package com.pusong.business.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.pusong.business.domain.bo.PsCustomCallbackBo;
@@ -47,7 +48,7 @@ public class PsCustomController extends BaseController {
 
     @SaCheckPermission("business:customInfo:list")
     @GetMapping("/listByLoginUser")
-    public R<List<PsCustomInfoVo>> listByLoginUser() {
+    public R<List<Map<String,Object>>> listByLoginUser() {
         return R.ok(psCustomInfoService.listByLoginUser());
     }
     /**
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java
index 0bc8374..0443535 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java
@@ -38,15 +38,15 @@ import java.util.List;
 public class PsHomeController extends BaseController {
 
     private final IPsCustomInfoService psCustomInfoService;
-    /**
-     * 查询登陆人下所有的客户名称和id
-     */
-    @RepeatSubmit()
-    @SaCheckPermission("business:customInfo:list")
-    @GetMapping("/listByLoginUser")
-    public R<List<PsCustomInfoVo>> listByLoginUser() {
-        return R.ok(psCustomInfoService.listByLoginUser());
-    }
+//    /**
+//     * 查询登陆人下所有的客户名称和id
+//     */
+//    @RepeatSubmit()
+//    @SaCheckPermission("business:customInfo:list")
+//    @GetMapping("/listByLoginUser")
+//    public R<List<PsCustomInfoVo>> listByLoginUser() {
+//        return R.ok(psCustomInfoService.listByLoginUser());
+//    }
 
 
 }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java
index 16cf7f8..a821c4f 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java
@@ -13,6 +13,7 @@ import com.pusong.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户基本信息Service接口
@@ -30,7 +31,7 @@ public interface IPsCustomInfoService {
      * 查询登陆人下所有的客户名称和id
      * @return 客户id和姓名
      */
-    List<PsCustomInfoVo> listByLoginUser();
+    List<Map<String,Object>> listByLoginUser();
     /**
      * 分页查询客户基本信息列表
      *
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
index 9ceddc7..a2600fc 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
@@ -74,10 +74,19 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
      * @return 客户id和姓名
      */
     @Override
-    public List<PsCustomInfoVo> listByLoginUser() {
+    public List<Map<String,Object>> listByLoginUser() {
         //查询客户基本信息
-        return baseMapper.selectVoList(new QueryWrapper<PsCustomInfo>().select("id","custom_name")
-                        .lambda().eq(PsCustomInfo::getDelFlag, 0));
+        List<PsCustomInfo> list = baseMapper.selectList(new QueryWrapper<PsCustomInfo>().select("id", "custom_name")
+                .lambda().eq(PsCustomInfo::getDelFlag, 0).isNotNull(PsCustomInfo::getCustomName));
+        List<Map<String,Object>> listmap = new ArrayList<>();
+        list.forEach(item->{
+            Map<String,Object> map = new HashMap<>();
+            map.put("id",item.getId());
+            map.put("customName",item.getCustomName());
+            listmap.add(map);
+        });
+
+        return listmap;
     }
 
     /**