Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/controller/MainController.java

@@ -149,6 +149,7 @@ public class MainController extends BaseController {
 //          return success(message, new LoginResult(access_token, user));
 //        }
 //      }
+      user = userService.getByUsernamePhone(username, tenantId);
     }else {
       // 判断图形验证码
       if (!tenantId.equals(10159) && !tenantId.equals(10158)) {
@@ -160,7 +161,7 @@ public class MainController extends BaseController {
         }
       }
       // 当前租户登录(登录账号|手机号码|邮箱登录)
-      user = userService.getByUsername(username, tenantId);
+      user = userService.getByUsernamePhone(username, tenantId);
     }
 
     if (user == null) {

src/main/java/com/gxwebsoft/common/system/entity/DictData.java

@@ -34,6 +34,10 @@ public class DictData implements Serializable {
     @Schema(description = "字典数据名称")
     private String dictDataName;
 
+    @Schema(description = "字段类型")
+    @TableField(exist = false)
+    private String type;
+
     @Schema(description = "字段名称")
     @TableField(exist = false)
     private String text;

src/main/java/com/gxwebsoft/common/system/service/UserService.java

@@ -58,6 +58,8 @@ public interface UserService extends IService<User>, UserDetailsService {
      */
     User getByUsername(String username, Integer tenantId);
 
+    User getByUsernamePhone(String username, Integer tenantId);
+
     /**
      * 添加用户
      *

src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java

@@ -110,6 +110,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return user;
     }
 
+    @Override
+    public User getByUsernamePhone(String username, Integer tenantId) {
+        if (StrUtil.isBlank(username)) {
+            return null;
+        }
+        User user = getOne(new LambdaQueryWrapper<User>()
+                .and(wrapper -> wrapper
+                        .eq(User::getUsername, username)
+                        .or()
+                        .eq(User::getPhone, username))
+                .eq(tenantId != null, User::getTenantId, tenantId)
+                .eq(User::getDeleted, 0)
+                .orderByDesc(User::getUserId)
+                .last("limit 1")
+        );
+        if (user != null) {
+            user.setRoles(userRoleService.listByUserId(user.getUserId()));
+            user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
+        }
+        return user;
+    }
+
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         return getByUsername(username);