From acea52a01c5c339863b1a547b423189fa91f08b1 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 19:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/customer/service/CustomerViewService.java   | 8 ++++----
 .../ic/employee/mapper/PrivilageCpUserDOMapper.java       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index da20fbc..572d7d2 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -665,22 +665,22 @@ public class CustomerViewService {
             shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList());
             List<String> cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList);
             Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds);
-            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
+            List<Map<String, Object>> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds);
 
             result.setAllCustomer(all);
             if(null != dis){
-                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString()));
             }
 
         }
         //管理员/总运营人员
         else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) {
             Long all = privilageCpUserDOMapper.selectAllCount();
-            List<Map<String, String>> dis = privilageCpUserDOMapper.selectDistinctAllCount();
+            List<Map<String, Object>> dis = privilageCpUserDOMapper.selectDistinctAllCount();
 
             result.setAllCustomer(all);
             if(null != dis){
-                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows")));
+                result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString()));
             }
         }
 
diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
index 8e6211f..ca882d6 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -19,7 +19,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     Long selectAllCount();
 
-    List<Map<String, String>> selectDistinctAllCount();
+    List<Map<String, Object>> selectDistinctAllCount();
 
     List<String> selectCustomerIdsByCpUserId(@Param("cpUserId")String cpUserId);
 
@@ -29,7 +29,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     Long selectStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
-    List<Map<String, String>> selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
+    List<Map<String, Object>> selectDistinctStoresCount(@Param("cpUserIds")List<String> cpUserIds);
 
     Long selectStoresCountById(@Param("shopIds")List<Long> shopIds);