From ec1a298fde8826da22a97085e059a2c294731824 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 3 Mar 2025 19:30:16 +0800
Subject: [PATCH] dept

---
 .../com/bonus/system/api/domain/SysUser.java  | 43 ++++++++++++++++---
 .../resources/mapper/system/SysUserMapper.xml |  8 +++-
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
index 4c12971..7eb835e 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
@@ -56,11 +56,6 @@ public class SysUser extends BaseEntity {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long firstLevelDeptId;
 
-    /**
-     * 是否客户，判断是否能够登录后台管理页面
-     */
-    private String isCustomer;
-
     /**
      * 用户账号
      */
@@ -176,6 +171,16 @@ public class SysUser extends BaseEntity {
     private String isBuiltIn = "1";
 
 
+    @ApiModelProperty("区域id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long areaId;
+
+    @ApiModelProperty("人员类别")
+    private String psnType;
+
+    @ApiModelProperty("人员类别名称")
+    private String psnTypeName;
+
     @ApiModelProperty("客户端人员id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long custId;
@@ -183,6 +188,10 @@ public class SysUser extends BaseEntity {
     @ApiModelProperty("客户端人员编号")
     private String custNum;
 
+    /**
+     * 是否客户，判断是否能够登录后台管理页面
+     */
+    private String isCustomer;
 
     public SysUser() {
 
@@ -409,6 +418,30 @@ public class SysUser extends BaseEntity {
         this.isPermanent = isPermanent;
     }
 
+    public Long getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(Long areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getPsnType() {
+        return psnType;
+    }
+
+    public void setPsnType(String psnType) {
+        this.psnType = psnType;
+    }
+
+    public String getPsnTypeName() {
+        return psnTypeName;
+    }
+
+    public void setPsnTypeName(String psnTypeName) {
+        this.psnTypeName = psnTypeName;
+    }
+
     public Long getCustId() {
         return custId;
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 454bbb3..e311425 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -32,6 +32,10 @@
         <result property="isCustomer" column="is_customer"/>
         <result property="custId" column="cust_id"/>
         <result property="custNum" column="cust_num"/>
+        <result property="areaId" column="area_id"/>
+        <result property="psnType" column="psn_type"/>
+        <result property="psnTypeName" column="psn_type_name"/>
+        <result property="isCustomer" column="is_customer"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -112,7 +116,9 @@
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status,
-        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
+        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in,
+        u.cust_id, u.cust_num, u.area_id, u.psn_type, u.psn_type_name, u.is_customer,
+        d.dept_name,
         d.leader,r.role_id,
         r.role_name,
         r.role_key,