修改数据权限bug

puzhibing

2024-01-30 03f1f3372a10a08f96f3308bfa099e86a55046d0

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

@@ -18,6 +18,7 @@
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
@@ -50,6 +51,8 @@
    @Autowired
    private RedisService redisService;

    @Autowired
    private RemoteConfigService remoteConfigService;
    /**
     * 登录
     */
@@ -135,15 +138,16 @@
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单",Constants.FROM_MINI_APP);
                throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
            }
            String servicePhone = remoteConfigService.getServicePhone().getData();
            if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号： 已被删除");
                throw new ServiceException(servicePhone,501);
            }
            if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
                throw new ServiceException("对不起，您的账号： 已停用");
                throw new ServiceException(servicePhone,501);
            }
            recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
        }
@@ -202,6 +206,10 @@
        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());
        }
        if (401 == userResult.getCode())
        {
            throw new ServiceException("商户已被冻结,请联系管理员",401);
        }
        QwH5LoginVo userInfo = userResult.getData();
        SysUser user = userInfo.getSysUser();
@@ -276,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;
    }