From f11cc2c0fb0c1fafab0d45440d82285192def606 Mon Sep 17 00:00:00 2001
From: DEV_ZZ <3568129659@qq.com>
Date: Thu, 11 Sep 2025 22:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mosty/common/core/business/entity/SysUser.java    | 11 ++++++++++-
 .../service/impl/TbJcglXfllInCommServiceImpl.java     |  1 +
 .../mosty/common/core/login/JwtTokenGenerator.java    |  1 +
 .../src/main/java/com/mosty/common/token/JWTUtil.java |  5 +----
 .../main/java/com/mosty/common/token/UserInfo.java    |  3 +++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java
index b67268f..aeed0bd 100644
--- a/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/entity/SysUser.java
@@ -181,11 +181,20 @@ public class SysUser implements Serializable {
     @TableField(value = "mk")
     private String mk;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     **/
     @TableField(value = "avatar")
     @ApiModelProperty(value = "头像")
     private String avatar;
 
+    /**
+     * 巡防力量ID
+     **/
+    @TableField(value = "xfll_id")
+    @ApiModelProperty(value = "巡防力量ID")
+    private String xfllId;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/TbJcglXfllInCommServiceImpl.java b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/TbJcglXfllInCommServiceImpl.java
index 099a546..a84518e 100644
--- a/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/TbJcglXfllInCommServiceImpl.java
+++ b/common-core-starter/src/main/java/com/mosty/common/core/business/service/impl/TbJcglXfllInCommServiceImpl.java
@@ -128,6 +128,7 @@ public class TbJcglXfllInCommServiceImpl extends ServiceImpl<TbJcglXfllInCommMap
         sysUser.setSfrh("0");
 //        sysUser.setMk();
         sysUser.setAvatar(entity.getTpid());
+        sysUser.setXfllId(entity.getId());
 
         return sysUser;
     }
diff --git a/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java b/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java
index 9f5f0ec..ed7f5e6 100644
--- a/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java
+++ b/common-core-starter/src/main/java/com/mosty/common/core/login/JwtTokenGenerator.java
@@ -86,6 +86,7 @@ public class JwtTokenGenerator {
                     .withClaim("inDustRialId", sysUser.getInDustRialId())
                     .withClaim("idEntityCard", sysUser.getIdEntityCard())
                     .withClaim("phone", sysUser.getMobile())
+                    .withClaim("xfllId", sysUser.getXfllId())
                     .withClaim("isVirtualUser", sysUser.getIsVirtualUser())
                     .withClaim("deptId", dept.getDeptid())
                     .withClaim("deptCode", dept.getDeptcode())
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java b/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java
index e2f1ab2..7eaf154 100644
--- a/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java
+++ b/common-token-starter/src/main/java/com/mosty/common/token/JWTUtil.java
@@ -1,6 +1,5 @@
 package com.mosty.common.token;
 
-import cn.hutool.json.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
@@ -9,12 +8,9 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.JWTVerifier;
 import com.mosty.common.base.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 
-import java.util.Date;
-
 import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_ISSUER;
 import static com.mosty.common.base.constant.SystemConfigConstants.TOKEN_KEY;
 
@@ -79,6 +75,7 @@ public class JWTUtil {
                 jwt.getClaim("idEntityCard").asString(),
                 jwt.getClaim("isVirtualUser").asString(),
                 jwt.getClaim("level").asString(),
+                jwt.getClaim("xfllId").asString(),
                 jwt.getClaim("deptId").asLong(),
                 jwt.getClaim("deptName").asString(),
                 jwt.getClaim("deptCode").asString(),
diff --git a/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java b/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java
index 0dd335a..ff862f6 100644
--- a/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java
+++ b/common-token-starter/src/main/java/com/mosty/common/token/UserInfo.java
@@ -52,6 +52,9 @@ public class UserInfo implements Serializable {
     @ApiModelProperty(value = "数据权限范围")
     public final String level;
 
+    @ApiModelProperty(value = "巡防力量ID")
+    public final String xfllId;
+
     @ApiModelProperty(value = "部门id")
     public final Long deptId;