修改代码

pz-admin/src/main/java/com/pz/web/controller/system/SysLoginController.java

 package com.pz.web.controller.system;
 package com.pz.web.controller.system;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.common.constant.Constants;
 import com.pz.common.constant.Constants;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.entity.SysMenu;
 import com.pz.common.core.domain.entity.SysMenu;
@@ -10,7 +11,11 @@ import com.pz.common.core.domain.model.LoginBody;
 import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.domain.model.SmsLoginBody;
 import com.pz.common.core.domain.model.SmsLoginBody;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.helper.LoginHelper;
+import com.pz.merchant.domain.Company;
+import com.pz.merchant.mapper.CompanyMapper;
+import com.pz.system.domain.vo.CityVo;
 import com.pz.system.domain.vo.RouterVo;
 import com.pz.system.domain.vo.RouterVo;
+import com.pz.system.mapper.CityMapper;
 import com.pz.system.service.ISysMenuService;
 import com.pz.system.service.ISysMenuService;
 import com.pz.system.service.ISysRoleService;
 import com.pz.system.service.ISysRoleService;
 import com.pz.system.service.ISysUserService;
 import com.pz.system.service.ISysUserService;
@@ -42,6 +47,8 @@ public class SysLoginController {
     private final ISysMenuService menuService;
     private final ISysMenuService menuService;
     private final ISysUserService userService;
     private final ISysUserService userService;
     private final ISysRoleService iSysRoleService;
     private final ISysRoleService iSysRoleService;
+    private final CompanyMapper companyMapper;
+    private final CityMapper cityMapper;
 
 
     /**
     /**
      * 登录方法
      * 登录方法
@@ -119,6 +126,12 @@ public class SysLoginController {
         ajax.put("user", user);
         ajax.put("user", user);
         ajax.put("roles", loginUser.getRolePermission());
         ajax.put("roles", loginUser.getRolePermission());
         ajax.put("permissions", loginUser.getMenuPermission());
         ajax.put("permissions", loginUser.getMenuPermission());
+        //获取当前商户用户城市
+        Optional.ofNullable(companyMapper.selectVoOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, user.getUserId())))
+            .ifPresent(companyVo -> {
+                CityVo cityVo = cityMapper.selectVoById(companyVo.getCityId());
+                ajax.put("cityName", cityVo.getName());
+            });
         return R.ok(ajax);
         return R.ok(ajax);
     }
     }