Browse Source

web端登录时候显示租户小区名称

hxd 1 month ago
parent
commit
eb595e8a14

+ 24 - 1
portal-service-common/src/main/java/com/hfln/portal/common/response/user/UserTokenInfo.java

@@ -77,6 +77,9 @@ public class UserTokenInfo extends BaseVO {
     @Schema(description = "当前用户的租户id")
     private Long tenantId;
 
+    @Schema(description = "用户所属小区")
+    private String tenantName;
+
     /**
      * @return token 名称
      */
@@ -258,16 +261,36 @@ public class UserTokenInfo extends BaseVO {
         this.userId = userId;
     }
 
-
+    /**
+     * @return  当前用户的租户id
+     */
     public Long getTenantId() {
         return tenantId;
     }
 
+
+    /**
+     * @param tenantId 租户id
+     */
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
 
     /**
+     * @return 用户所属小区
+     */
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    /**
+     * @param tenantName 用户所属小区
+     */
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    /**
      * toString
      */
     @Override

+ 4 - 0
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -320,6 +320,9 @@ public class WebGatewayImpl implements WebGateway {
             saSession.set(UserConstants.SA_USER_NAME, adminUser.getUserName());
         }
 
+        // 查询用户所属小区信息
+        TblTenant tenant = tblTenantService.getById(adminUser.getTenantId());
+
         // 当前用户登录后,需要将当前用户的权限保存到redis,用于网关校验权限
         userAuthService.cacheRolesAndPermissions();
 
@@ -327,6 +330,7 @@ public class WebGatewayImpl implements WebGateway {
         AdminLoginRes res = CopyUtils.copy(tokenInfo, AdminLoginRes.class);
         BeanUtils.copyProperties(adminUser, res);
         res.setTenantId(adminUser.getTenantId());
+        res.setTenantName(tenant.getTenantName());
         log.info("当前用户account:{},登录成功", param.getAccount());
         return res;
     }