Merge remote-tracking branch 'origin/master'

无关风月

2025-07-14 3548f8f669884e1caf9f037a726394464eb85d44

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

@@ -334,6 +334,14 @@
         </foreach>
      </if>
   </select>
    <select id="selectUserByNickName" resultType="com.ruoyi.common.core.domain.entity.SysUser">
      select  * from sys_user
      where status = 0
      and del_flag = 0
      <if test="nickName != null and nickName != ''">
         AND nick_name = #{nickName}
      </if>
   </select>

    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
       insert into sys_user(