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 */