From 3bbc1458f7a8ade7d8f3a43dfadf6225e0c7b748 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 一月 2024 13:47:52 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
index b21c138..e1f9937 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
@@ -1,12 +1,36 @@
 package com.zy.asrs.wcs.sys.service.impl;
 
-import com.zy.asrs.wcs.sys.mapper.UserMapper;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.sys.mapper.UserMapper;
+import com.zy.asrs.wcs.sys.service.RoleMenuService;
+import com.zy.asrs.wcs.sys.service.UserRoleService;
+import com.zy.asrs.wcs.sys.service.UserService;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 
 @Service("userService")
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
+    @Resource
+    private UserRoleService userRoleService;
+    @Resource
+    private RoleMenuService roleMenuService;
+
+    @Override
+    public User getByUsername(String username, Long hostId) {
+        if (Cools.isEmpty(username)) {
+            return null;
+        }
+        User user = baseMapper.selectByUsername(username, hostId);
+        if (user != null) {
+            user.setRoles(userRoleService.listByUserId(user.getId()));
+            user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+        }
+        return user;
+    }
+
+
 }

--
Gitblit v1.9.1