修改bug

puzhibing

2023-12-13 1772afb069b75871572c9c438bbd2bc403f864df

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -284,11 +284,15 @@
        if (R.FAIL == userResult.getCode()) {
            throw new ServiceException(userResult.getMsg());
        }
//        ShopRelUserVo shopInfo = shopResult.getData();
//        if(null == shopInfo){
//            throw new ServiceException("未查询到商户信息");
//        }
//        userInfo.setShopId(shopInfo.getShopId());
        ShopRelUserVo shopInfo = shopResult.getData();
        if(null == shopInfo){
            throw new ServiceException("未查询到商户信息");
        if(null != shopInfo){
            userInfo.setShopId(shopInfo.getShopId());
        }
        userInfo.setShopId(shopInfo.getShopId());
        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
        return userInfo;
    }