forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | show whitespace
liusuyi
2026-01-19 3c8d6b8e60f02b9a40fc5acd4dc6c34a6b594eb6 
 ard-system/src/main/resources/mapper/system/SysUserMapper.xml


@@ -18,6 +18,8 @@


        <result property="delFlag"      column="del_flag"     />


        <result property="loginIp"      column="login_ip"     />


        <result property="loginDate"    column="login_date"   />


      <result property="priority"     column="priority"       />


      <result property="platform"     column="platform"       />


        <result property="createBy"     column="create_by"    />


        <result property="createTime"   column="create_time"  />


        <result property="updateBy"     column="update_by"    />


@@ -47,7 +49,7 @@


    </resultMap>


   


   <sql id="selectUserVo">


        select u.user_id, u.dept_id, u.user_name, u.nick_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, 


        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.priority,u.platform,u.login_date, u.create_by, u.create_time, u.remark,


        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,


        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status


        from sys_user u


@@ -57,7 +59,7 @@


    </sql>


    


    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">


      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


      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.priority,u.platform, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u


      left join sys_dept d on u.dept_id = d.dept_id


      where u.del_flag = '0'


      <if test="userId != null and userId != 0">


@@ -155,6 +157,8 @@


          <if test="password != null and password != ''">password,</if>


          <if test="status != null and status != ''">status,</if>


          <if test="createBy != null and createBy != ''">create_by,</if>


         <if test="priority != null and priority != ''">priority,</if>


         <if test="platform != null and platform != ''">platform,</if>


          <if test="remark != null and remark != ''">remark,</if>


          create_time


       )values(


@@ -169,6 +173,8 @@


          <if test="password != null and password != ''">#{password},</if>


          <if test="status != null and status != ''">#{status},</if>


          <if test="createBy != null and createBy != ''">#{createBy},</if>


         <if test="priority != null and priority != ''">#{priority},</if>


         <if test="platform != null and platform != ''">#{platform},</if>


          <if test="remark != null and remark != ''">#{remark},</if>


          sysdate()


       )


@@ -189,6 +195,8 @@


          <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>


          <if test="loginDate != null">login_date = #{loginDate},</if>


          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>


         <if test="priority != null">priority = #{priority},</if>


         <if test="platform != null">platform = #{platform},</if>


          <if test="remark != null">remark = #{remark},</if>


          update_time = sysdate()


       </set>