正在显示
2 个修改的文件
包含
1 行增加
和
5 行删除
| @@ -5,8 +5,6 @@ import java.util.List; | @@ -5,8 +5,6 @@ import java.util.List; | ||
| 5 | import javax.validation.constraints.*; | 5 | import javax.validation.constraints.*; |
| 6 | import org.apache.commons.lang3.builder.ToStringBuilder; | 6 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 7 | import org.apache.commons.lang3.builder.ToStringStyle; | 7 | import org.apache.commons.lang3.builder.ToStringStyle; |
| 8 | -import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| 9 | -import com.fasterxml.jackson.annotation.JsonProperty; | ||
| 10 | import com.ruoyi.common.annotation.Excel; | 8 | import com.ruoyi.common.annotation.Excel; |
| 11 | import com.ruoyi.common.annotation.Excel.ColumnType; | 9 | import com.ruoyi.common.annotation.Excel.ColumnType; |
| 12 | import com.ruoyi.common.annotation.Excel.Type; | 10 | import com.ruoyi.common.annotation.Excel.Type; |
| @@ -202,8 +200,6 @@ public class SysUser extends BaseEntity | @@ -202,8 +200,6 @@ public class SysUser extends BaseEntity | ||
| 202 | this.avatar = avatar; | 200 | this.avatar = avatar; |
| 203 | } | 201 | } |
| 204 | 202 | ||
| 205 | - @JsonIgnore | ||
| 206 | - @JsonProperty | ||
| 207 | public String getPassword() | 203 | public String getPassword() |
| 208 | { | 204 | { |
| 209 | return password; | 205 | return password; |
| @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 57 | </sql> | 57 | </sql> |
| 58 | 58 | ||
| 59 | <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> | 59 | <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> |
| 60 | - select u.user_id, u.dept_id, u.nick_name, u.user_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, d.dept_name, d.leader from sys_user u | 60 | + 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 from sys_user u |
| 61 | left join sys_dept d on u.dept_id = d.dept_id | 61 | left join sys_dept d on u.dept_id = d.dept_id |
| 62 | where u.del_flag = '0' | 62 | where u.del_flag = '0' |
| 63 | <if test="userId != null and userId != 0"> | 63 | <if test="userId != null and userId != 0"> |
-
请 注册 或 登录 后发表评论