diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 39d006a..a1f47fd 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -194,7 +194,9 @@ public class CustomerService {
         insertCustomer.setName(turnBackDTOS.getName());
         insertCustomer.setAvatarUrl(turnBackDTOS.getWxData().getAvatarUrl());
         insertCustomer.setPhone(turnBackDTOS.getPhone());
-        insertCustomer.setShopName(shop.getName());
+        if (shop != null && StringUtils.isNotBlank(shop.getName())){
+            insertCustomer.setShopName(shop.getName());
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         insertCustomer.setCreateTime(sdf.parse(turnBackDTOS.getJoinTime()));
         if (null != opCustomer) {
diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
index a0042de..160ebfe 100644
--- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml
@@ -35,7 +35,7 @@
         limit 1
     </select>
     <select id="selectOneCpUser" resultType="com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO">
-        select t2.* from privilage_cp_user t1,privilage_cp_user_store t2
+        select t2.id,t2.store_id as storeId,t2.cp_user_id as cpUserId from privilage_cp_user t1,privilage_cp_user_store t2
         where t1.id = t2.cp_user_id
         and t1.cp_user_id = #{cpUser}
         limit 1