用户excel格式修改

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

@@ -65,7 +65,7 @@ public class SysUser extends BaseEntity {
     /**
      * 用户性别
      */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    @Excel(name = "用户性别", readConverterExp = "1=男,2=女,3=未知")
     private Integer sex;
 
     /**
@@ -81,7 +81,7 @@ public class SysUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "帐号状态", readConverterExp = "1=正常,2=停用")
     private Integer status;
 
     /**

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

@@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND status = 1
 	</select>
 	<select id="selectUserLists" resultMap="SysUserResult" parameterType="com.ozs.common.core.domain.vo.SysUserVo">
-		select u.id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone_num, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+		select u.id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone_num, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.data_permission
         from sys_user u
 		<where>
 			<if test="userName != null and userName != ''">