业务员代码

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

@@ -149,6 +149,11 @@ public class SysUser extends BaseEntity {
      */
     private String tenantId;
 
+    /**
+     * 业务员代码
+     */
+    private String userCode;
+
     public SysUser() {
 
     }
@@ -341,6 +346,14 @@ public class SysUser extends BaseEntity {
         this.jobNumber = jobNumber;
     }
 
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
     @Override
     public String toString() {
         return "SysUser{" +
@@ -365,7 +378,8 @@ public class SysUser extends BaseEntity {
                 ", postIds=" + Arrays.toString(postIds) +
                 ", roleId=" + roleId +
                 ", tenantId='" + tenantId + '\'' +
+                ", userCode='" + userCode + '\'' +
                 '}';
     }
-
+    
 }

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"       column="remark"       />
 		<result property="tenantId" 	column="tenant_id"    />
 		<result property="jobNumber"    column="job_number"	  />
+		<result property="userCode" column="user_code"/>
 		<result property="userType"     column="user_type"	  />
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.create_time,
 			   u.remark,
 			   u.tenant_id,
+			   u.user_code,
 			   d.dept_id,
 			   d.parent_id,
 			   d.ancestors,
@@ -94,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		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, d.dept_name, d.leader_id,
-		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id
+		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -135,13 +137,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-	    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
-			 left join sys_role r on r.role_id = ur.role_id
-	    where u.del_flag = '0' and r.role_id = #{roleId}
-	    <if test="userName != null and userName != ''">
+		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,
+		u.user_code
+		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
+		left join sys_role r on r.role_id = ur.role_id
+		where u.del_flag = '0' and r.role_id = #{roleId}
+		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
@@ -152,14 +155,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-	    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
-			 left join sys_role r on r.role_id = ur.role_id
-	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
-	    <if test="userName != null and userName != ''">
+		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,
+		u.user_code
+		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
+		left join sys_role r on r.role_id = ur.role_id
+		where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+		and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
+		ur.role_id = #{roleId})
+		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
@@ -222,7 +227,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.create_by,
 			   u.create_time,
 			   u.remark,
-			   u.tenant_id
+			   u.tenant_id,
+			   u.user_code
 		from sys_user_post sup
 				 inner join sys_user u on sup.user_id = u.user_id
 		where sup.post_id = #{postId}
@@ -245,7 +251,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.create_by,
 			   u.create_time,
 			   u.remark,
-			   u.tenant_id
+			   u.tenant_id,
+			   u.user_code
 		from sys_user_role sur
 				 inner join sys_user u on sur.user_id = u.user_id
 		where sur.role_id = #{roleId}
@@ -268,6 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != ''">tenant_id,</if>
 		<if test="userType != null and userType != ''">user_type,</if>
 		<if test="jobNumber != null and jobNumber != ''">job_number,</if>
+		<if test="userCode != null and userCode != ''">user_code,</if>
 		create_time
 		)values(
 		<if test="userId != null and userId != ''">#{userId},</if>
@@ -285,6 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
 		<if test="userType != null and userType != ''">#{userType},</if>
 		<if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
+		<if test="userCode != null and userCode != ''">#{userCode},</if>
 		sysdate()
 		)
 	</insert>
@@ -308,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="userType != null and userType != ''">user_type = #{userType},</if>
             <if test="jobNumber != null and jobNumber != ''">job_number = #{jobNumber},</if>
+			<if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}