#

luxiaotao1123

2024-02-13 edfa49f201d3fc8fc6b51b700e91f80246660855

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java

@@ -7,6 +7,7 @@
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.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -18,19 +19,40 @@
    private UserRoleService userRoleService;
    @Resource
    private RoleMenuService roleMenuService;
    @Resource
    private BCryptPasswordEncoder bCryptPasswordEncoder;

    @Override
    public User getByUsername(String username, Integer hostId) {
    public User getByUsername(String username, Long hostId) {
        if (Cools.isEmpty(username)) {
            return null;
        }
        User user = baseMapper.selectByUsername(username, tenantId);
        User user = baseMapper.selectByUsername(username, hostId);
        if (user != null) {
            user.setRoles(userRoleService.listByUserId(user.getUserId()));
            user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
            user.setRoles(userRoleService.listByUserId(user.getId()));
            user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
        }
        return user;
    }

    @Override
    public User getByIdRel(Long userId) {
        User user = this.getById(userId);
        if (user != null) {
            user.setRoles(userRoleService.listByUserId(user.getId()));
            user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
        }
        return user;
    }

    @Override
    public boolean comparePassword(String dbPassword, String inputPassword) {
        return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
    }

    @Override
    public String encodePassword(String password) {
        return password == null ? null : bCryptPasswordEncoder.encode(password);
    }

}