From 8a6ea0e4365f3a755e9d846e5c78078b138d99ec Mon Sep 17 00:00:00 2001
From: ruying408 <1877972603@qq.com>
Date: Mon, 19 Aug 2024 22:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9Aapp=E7=AB=AF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=AA=8C=E8=AF=81=E7=A0=81=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=90=8E=E6=8F=92=E5=85=A5=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/impl/BaseSysPermsServiceImpl.java      |  2 +-
 .../service/impl/UserLoginServiceImpl.java     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
index 9b9671b..56cc594 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
@@ -142,7 +142,7 @@ public class BaseSysPermsServiceImpl implements BaseSysPermsService {
 
         QueryWrapper queryWrapper = QueryWrapper.create().select(BASE_SYS_MENU_ENTITY.ALL_COLUMNS).from(BASE_SYS_MENU_ENTITY);
         if (ObjectUtil.isNotEmpty(roleIds)) {
-            queryWrapper.join(BASE_SYS_ROLE_MENU_ENTITY).on(BASE_SYS_MENU_ENTITY.ID.eq(BASE_SYS_ROLE_MENU_ENTITY.MENU_ID)).and(BASE_SYS_ROLE_MENU_ENTITY.ROLE_ID.in((Object) roleIds));
+            queryWrapper.leftJoin(BASE_SYS_ROLE_MENU_ENTITY).on(BASE_SYS_MENU_ENTITY.ID.eq(BASE_SYS_ROLE_MENU_ENTITY.MENU_ID)).and(BASE_SYS_ROLE_MENU_ENTITY.ROLE_ID.in((Object) roleIds));
         }
         return baseSysMenuMapper.selectListByQuery(queryWrapper.groupBy(BASE_SYS_MENU_ENTITY.ID).orderBy(BASE_SYS_MENU_ENTITY.ORDER_NUM, false));
     }
diff --git a/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java b/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
index 993673c..8a9909d 100644
--- a/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
+++ b/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
@@ -3,6 +3,7 @@ package com.cool.modules.user.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.crypto.digest.MD5;
 import cn.hutool.jwt.JWT;
 import com.cool.core.cache.CoolCache;
@@ -109,9 +110,26 @@ public class UserLoginServiceImpl implements UserLoginService {
     private Object generateTokenByPhone(String phone) {
         UserInfoEntity userInfoEntity = userInfoMapper.selectOneByQuery(
             QueryWrapper.create().eq(UserInfoEntity::getPhone, phone));
+        if (ObjUtil.isEmpty(userInfoEntity)) {
+            userInfoEntity = new UserInfoEntity();
+            userInfoEntity.setPhone(phone);
+            // 生成随机昵称
+            userInfoEntity.setNickName(generateRandomNickname());
+            userInfoEntity.save();
+        }
         return generateToken(userInfoEntity, null);
     }
 
+    /**
+     *
+     * @return 生成的昵称
+     */
+    private String generateRandomNickname() {
+        // 定义昵称的长度
+        int length = 8;
+        // 生成随机字符串
+        return RandomUtil.randomString(length);
+    }
     /**
      * 生成token
      */