1229

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -1,6 +1,5 @@
 package cn.ezhizao.project.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.ezhizao.common.xss.Xss;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
@@ -136,6 +135,14 @@ public class SysUser extends BaseEntity {
 
     private Long roleId;
 
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
     @Override
     public Long getTenantId() {
         return tenantId;
@@ -146,12 +153,6 @@ public class SysUser extends BaseEntity {
         this.tenantId = tenantId;
     }
 
-    public Long getRoleId() {
-        return roleId;
-    }
-    public void setRoleId(Long tenantId) {
-        this.roleId = roleId;
-    }
 
     public String getIsLeader() {
         return isLeader;

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -202,8 +202,8 @@
 		<if test="userName != null and userName != ''">
 			AND u.user_name LIKE concat('%', #{userName}, '%')
 		</if>
-		<if test="phoneNumber != null and phoneNumber != ''">
-			AND u.phone_number LIKE concat('%', #{phoneNumber}, '%')
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name LIKE concat('%', #{nickName}, '%')
 		</if>
 		<if test="tenantId != null  and tenantId != 0"> AND u.tenant_id = #{tenantId}</if>
 		<!-- 数据范围过滤 -->
@@ -221,8 +221,8 @@
 		<if test="userName != null and userName != ''">
 			AND u.user_name LIKE concat('%', #{userName}, '%')
 		</if>
-		<if test="phoneNumber != null and phoneNumber != ''">
-			AND u.phone_number LIKE concat('%', #{phoneNumber}, '%')
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name LIKE concat('%', #{nickName}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}