nickName 问题修复

fs-service/src/main/resources/mapper/hisStore/FsUserScrmMapper.xml

@@ -28,7 +28,6 @@
         <result property="isDel"    column="is_del"    />
         <result property="userCode"    column="user_code"    />
         <result property="remark"    column="remark"    />
-        <result property="nickname"    column="nick_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="lastIp"    column="last_ip"    />
@@ -88,7 +87,7 @@
             <if test="birthday != null ">and birthday = #{birthday}</if>
             <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>
             <if test="remark != null  and remark != ''">and remark = #{remark}</if>
-            <if test="nickname != null  and nickname != ''">and nick_name like concat('%', #{nickname}, '%')</if>
+            <if test="nickName != null  and nickName != ''">and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="avatar != null  and avatar != ''">and avatar = #{avatar}</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="lastIp != null  and lastIp != ''">and last_ip = #{lastIp}</if>
@@ -157,11 +156,11 @@
             <if test="registerCode != null   and registerCode != '' ">and register_code = #{registerCode}</if>
             <if test="source != null  and source != '' ">and source = #{source}</if>
             <if test="isShow != null  ">and is_show = #{isShow}</if>
-            <if test="(username != null  and username != '') or (userId != null  and userId != '') or (nickname != null  and nickname != '') or (phone != null  and phone != '')">
+            <if test="(username != null  and username != '') or (userId != null  and userId != '') or (nickName != null  and nickName != '') or (phone != null  and phone != '')">
                 and (
                 <if test="username != null  and username != ''">username like concat('%', #{username}, '%')</if>
                 <if test="userId != null  and userId != ''">or user_id = #{userId}</if>
-                <if test="nickname != null  and nickname != ''">or nick_name like concat('%', #{nickname}, '%')</if>
+                <if test="nickName != null  and nickName != ''">or nick_name like concat('%', #{nickName}, '%')</if>
                 <if test="phone != null  and phone != ''">or phone like concat('%',#{phone},'%')</if>
                 )
             </if>
@@ -264,8 +263,8 @@
         <if test = "maps.userId != null" >
             AND u.user_id = #{maps.userId}
         </if >
-        <if test = "maps.nickname != null and  maps.nickname !='' " >
-            AND u.nick_name LIKE CONCAT("%",#{maps.nickname},"%")
+        <if test = "maps.nickName != null and  maps.nickName !='' " >
+            AND u.nick_name LIKE CONCAT("%",#{maps.nickName},"%")
         </if >
         <if test = "maps.phone != null   and  maps.phone !='' " >
         AND u.phone LIKE CONCAT("%",#{maps.phone},"%")
@@ -339,8 +338,8 @@
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
         1 = 1 and u.nick_name is not null
-        <if test = "maps.nickname != null and  maps.nickname !='' " >
-            AND u.nick_name LIKE CONCAT("%",#{maps.nickname},"%")
+        <if test = "maps.nickName != null and  maps.nickName !='' " >
+            AND u.nick_name LIKE CONCAT("%",#{maps.nickName},"%")
         </if >
             <if test = "maps.userId != null and  maps.userId !='' " >
             AND u.user_id = #{maps.userId}
@@ -408,7 +407,6 @@
             <if test="isDel != null">is_del,</if>
             <if test="userCode != null">user_code,</if>
             <if test="remark != null">remark,</if>
-            <if test="nickname != null">nick_name,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="lastIp != null">last_ip,</if>
@@ -475,7 +473,6 @@
             <if test="isDel != null">#{isDel},</if>
             <if test="userCode != null">#{userCode},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="nickname != null">#{nickname},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="lastIp != null">#{lastIp},</if>
@@ -523,7 +520,7 @@
     <update id="updateFsUser">
         update fs_user
         <trim prefix="SET" suffixOverrides=",">
-            <if test="nickname != null">nick_name = #{nickname},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="avatar != null">avatar = #{avatar},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="integral != null">integral = #{integral},</if>
@@ -631,8 +628,8 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="nickname != null and nickname != ''">
-                AND fs_user.nick_name like concat('%', #{nickname},'%')
+            <if test="nickName != null and nickName != ''">
+                AND fs_user.nick_name like concat('%', #{nickName},'%')
             </if>
             <if test="phone != null and phone != ''">
                 AND fs_user.phone like concat('%', #{phone},'%')
@@ -1699,8 +1696,8 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="nickname != null and nickname!=''">
-                AND fs_user.nick_name like concat(#{nickname},'%')
+            <if test="nickName != null and nickName!=''">
+                AND fs_user.nick_name like concat(#{nickName},'%')
             </if>
             <if test="phone != null and phone!=''">
                 AND fs_user.phone like concat('%', #{phone},'%')