新增用户兼容尚辉的表

slibra-common/src/main/java/com/slibra/common/core/domain/entity/SysUser.java

@@ -103,6 +103,43 @@ public class SysUser extends BaseEntity
     //用户类型【前后台隔离】： 0前端  1后端  2小程序
     private Integer type = 0;//默认是前台用户
 
+    //2024年11月11日17:47:33  新增坐席相关的字段【结合余尚辉的表】
+    /** 租户隔离 */
+    @Excel(name = "租户隔离")
+    private String saasId;
+
+    /** 坐席工号 */
+    @Excel(name = "坐席工号")
+    private String agentNum;
+
+    /** 外部id */
+    @Excel(name = "外部id")
+    private String outId;
+
+    /** 坐席类型 0:普通坐席 ;1:组长:2:主管 */
+    @Excel(name = "坐席类型 0:普通坐席 ;1:组长:2:主管")
+    private Long agentType;
+
+    /** 分机号 */
+    @Excel(name = "分机号")
+    private String phoneNum;
+
+    /** 分配标志  0:不参与排队；1:参与排队 */
+    @Excel(name = "分配标志  0:不参与排队；1:参与排队")
+    private Long distribute;
+
+    /** 账号状态 0:可用;1:禁用 */
+    @Excel(name = "账号状态 0:可用;1:禁用")
+    private Long agentState;
+
+    /** 身份标识 */
+    @Excel(name = "身份标识")
+    private Long identityType;
+
+    /** 删除标识 */
+    @Excel(name = "删除标识")
+    private Long isDelete;
+
 
     public Integer getType() {
         return type;
@@ -344,6 +381,78 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
+    public String getSaasId() {
+        return saasId;
+    }
+
+    public void setSaasId(String saasId) {
+        this.saasId = saasId;
+    }
+
+    public String getAgentNum() {
+        return agentNum;
+    }
+
+    public void setAgentNum(String agentNum) {
+        this.agentNum = agentNum;
+    }
+
+    public String getOutId() {
+        return outId;
+    }
+
+    public void setOutId(String outId) {
+        this.outId = outId;
+    }
+
+    public Long getAgentType() {
+        return agentType;
+    }
+
+    public void setAgentType(Long agentType) {
+        this.agentType = agentType;
+    }
+
+    public String getPhoneNum() {
+        return phoneNum;
+    }
+
+    public void setPhoneNum(String phoneNum) {
+        this.phoneNum = phoneNum;
+    }
+
+    public Long getDistribute() {
+        return distribute;
+    }
+
+    public void setDistribute(Long distribute) {
+        this.distribute = distribute;
+    }
+
+    public Long getAgentState() {
+        return agentState;
+    }
+
+    public void setAgentState(Long agentState) {
+        this.agentState = agentState;
+    }
+
+    public Long getIdentityType() {
+        return identityType;
+    }
+
+    public void setIdentityType(Long identityType) {
+        this.identityType = identityType;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

slibra-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -27,6 +27,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="position"       column="position"       />
         <result property="weChat"       column="we_chat"       />
 		<result property="type"        column="type"       />
+		<!-- 2024年11月11日17:49:29   新增坐席相关的字段【结合余尚辉的表】-->
+		<result property="saasId"    column="saas_id"    />
+		<result property="agentNum"    column="agent_num"    />
+		<result property="outId"    column="out_id"    />
+		<result property="agentType"    column="agent_type"    />
+		<result property="phoneNum"    column="phone_num"    />
+		<result property="distribute"    column="distribute"    />
+		<result property="agentState"    column="agent_state"    />
+		<result property="identityType"    column="identity_type"    />
+		<result property="isDelete"    column="is_delete"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -53,7 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type type,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.emergency_phone emergency_phone, u.position position, u.we_chat we_chat
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.emergency_phone emergency_phone, u.position position, u.we_chat we_chat,
+        u.saas_id saas_id, u.agent_num agent_num, u.out_id out_id, u.agent_type agent_type, u.phone_num phone_num, u.distribute distribute, u.agent_state agent_state, u.identity_type identity_type, u.is_delete is_delete
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id