增加excel模板

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

@@ -55,6 +55,14 @@ public class SysUser extends BaseEntity {
         this.userType = userType;
     }
 
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
     /**
      * 用户昵称
      */
@@ -135,7 +143,10 @@ public class SysUser extends BaseEntity {
      * 岗位组
      */
     private Long[] postIds;
-
+    /**
+     * 企业ID
+     */
+    private Long enterpriseId;
     /**
      * 角色ID
      */

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

@@ -12,6 +12,7 @@
         <result property="email" column="email"/>
 
         <result property="userType" column="user_type"/>
+        <result property="enterpriseId" column="enterprise_id"/>
 
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
@@ -59,6 +60,7 @@
                u.phonenumber,
                u.password,
                u.user_type,
+               u.enterprise_id,
                u.sex,
                u.status,
                u.del_flag,
@@ -87,7 +89,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id,u.user_type, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id,u.enterprise_id,u.user_type, 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 from sys_user
         u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -120,7 +122,7 @@
 
     <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
             resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id,u.enterprise_id,u.user_type, 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
@@ -138,7 +140,7 @@
 
     <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
             resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id,u.enterprise_id,u.user_type, 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
@@ -201,6 +203,7 @@
         <if test="avatar != null and avatar != ''">avatar,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
+        <if test="enterpriseId != null and enterpriseId != ''">enterprise_id,</if>
         <if test="userType != null and userType != ''">user_type,</if>
         <if test="password != null and password != ''">password,</if>
         <if test="status != null and status != ''">status,</if>
@@ -212,6 +215,7 @@
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="userName != null and userName != ''">#{userName},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
+        <if test="enterpriseId != null and enterpriseId != ''">#{enterpriseId},</if>
         <if test="userType != null and userType != ''">#{userType},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="avatar != null and avatar != ''">#{avatar},</if>
@@ -237,6 +241,8 @@
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
             <if test="password != null and password != ''">password = #{password},</if>
+            <if test="enterpriseId != null and enterpriseId != ''">enterprise_id = #{enterpriseId},</if>
+
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
             <if test="loginDate != null">login_date = #{loginDate},</if>