From abfcc953ea8c33acf651996f867eb0c16b9ea6dd Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Mon, 11 Nov 2024 10:03:13 +0800
Subject: [PATCH] 1

(cherry picked from commit 29939dc277cd50adebd92698801e20ec0ec83d7c)
---
 .../custom/service/impl/CustomerMainServiceImpl.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java
index 93c60d2b..f21f34d3 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java
@@ -41,9 +41,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static cn.iocoder.yudao.common.BaseConstants.*;
 import static cn.iocoder.yudao.common.DictBaseConstants.DICT_CUS_TYPE;
@@ -120,7 +118,7 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
                 AdminUserRespDTO userDTO = adminUserApi.getUserByUsername(saveReqVO.getPhoneNumber());
                 user = BeanUtils.toBean(userDTO, UserDTO.class);
                 //存在两种情况，一是该用户已经注册，二是该用户未注册
-                if (null == user){
+                if (null == userDTO){
                     user = new UserDTO();
                     //如果不存在创建用户；
                     user.setUsername(saveReqVO.getPhoneNumber());
@@ -164,10 +162,10 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
                 }
                 //客户表绑定用户id
                 main.setUserId(userId);
-                //绑定角色
-                Set<String> roleCodes = new HashSet<>();
-                roleCodes.add(dict.getRemark());
-                permissionApi.assignUserRole(userId, roleCodes);
+                //绑定角色----客户不设置角色
+//                Set<String> roleCodes = new HashSet<>();
+//                roleCodes.add(dict.getRemark());
+//                permissionApi.assignUserRole(userId, roleCodes);
             }
             /*3、保存客户主表信息*/
             //暂时写死会员id  TODO