修改了一个bug

feige

2025-12-01 9c6131807b50fac0ed6e9f517a6c3f132c7235df

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

@@ -24,6 +24,8 @@
        <result property="updateTime"   column="update_time"  />
      <result property="clanId"   column="clan_id"  />
        <result property="remark"       column="remark"       />
        <result property="paid"       column="paid"       />
        <result property="remainTime"       column="remain_time"       />
        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
    </resultMap>
@@ -48,7 +50,7 @@
    </resultMap>

   <sql id="selectUserVo">
        select u.clan_id,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.clan_id,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,u.clan_id,u.paid,u.remain_time,
        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
@@ -167,6 +169,11 @@
      where u.user_name = #{userName} and u.del_flag = '0'
   </select>

   <select id="getUserByUserName" parameterType="String" resultMap="SysUserResult">
      <include refid="selectUserVo"/>
      where u.user_name = #{userName} and u.del_flag = '0'
   </select>


   <select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
      <include refid="selectUserVo"/>
@@ -191,6 +198,10 @@
   
   <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
      select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
   </select>

   <select id="checkEmail" parameterType="SysUser" resultMap="SysUserResult">
      select user_id, email,nick_name from sys_user where email = #{email} and nick_name = #{nickName} and del_flag = '0' limit 1
   </select>

   <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -245,7 +256,9 @@
          <if test="loginDate != null">login_date = #{loginDate},</if>
          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
          <if test="remark != null">remark = #{remark},</if>
          update_time = sysdate()
         <if test="paid != null and paid != ''">paid = #{paid},</if>
         <if test="remainTime != null and remainTime != ''">remain_time = #{remainTime},</if>
         update_time = sysdate()
       </set>
       where user_id = #{userId}
   </update>