工具类，案件压缩包导入优化

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

@@ -121,8 +121,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		);
 	</insert>
-	
-	<update id="updateDept" parameterType="SysDept">
+    <insert id="batchSave">
+		insert into sys_dept(
+		dept_id,
+		parent_id,
+		dept_name,
+		dept_type,
+		ancestors,
+		order_num,
+		leader,
+		phone,
+		email,
+		status,
+		create_by,
+		create_time
+		)values
+		<foreach item="item" index="index" collection="list" separator=",">
+		(
+		#{item.deptId},
+		#{item.parentId},
+		#{item.deptName},
+		#{item.deptType},
+		#{item.ancestors},
+		#{item.orderNum},
+		#{item.leader},
+		#{item.phone},
+		#{item.email},
+		#{item.status},
+		#{item.createBy},
+		sysdate()
+		)
+		</foreach>;
+
+	</insert>
+
+    <update id="updateDept" parameterType="SysDept">
  		update sys_dept
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>

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

@@ -59,8 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.id_card, 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
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.id_card, 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 , r.role_id, r.role_name, d.dept_id
+		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'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -244,8 +248,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-	<update id="updateUser" parameterType="SysUser">
+    <insert id="batchSave">
+		insert into sys_user(
+		user_id,
+		dept_id,
+		user_name,
+		nick_name,
+		id_card,
+		email,
+		avatar,
+		phonenumber,
+		sex,
+		password,
+		status,
+		create_by,
+		remark,
+		create_time
+		)values
+		<foreach item="item" index="index" collection="list" separator=",">
+		(
+		#{item.userId},
+		#{item.deptId},
+		#{item.userName},
+		#{item.nickName},
+		#{item.idCard},
+		#{item.email},
+		#{item.avatar},
+		#{item.phonenumber},
+		#{item.sex},
+		#{item.password},
+		#{item.status},
+		#{item.createBy},
+		#{item.remark},
+		sysdate()
+		)
+		</foreach>;
+	</insert>
+
+    <update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>