更新新建用户问题

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

@@ -82,12 +82,12 @@
 
     <select id="checkRoleNameUnique" parameterType="java.lang.String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_name=#{roleName} limit 1
+        where r.role_name=#{roleName} and del_flag = '0' limit 1
     </select>
 
     <select id="checkRoleKeyUnique" parameterType="java.lang.String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_key=#{roleKey} limit 1
+        where r.role_key=#{roleKey} and del_flag = '0' limit 1
     </select>
 
     <insert id="insertRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole" useGeneratedKeys="true"

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

@@ -89,7 +89,7 @@
 
     <select id="selectUserByUserName" parameterType="java.lang.String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.user_name = #{userName}
+        where u.user_name = #{userName} and u.del_flag = '0' limit  1
     </select>
 
     <select id="selectUserById" parameterType="java.lang.Long" resultMap="SysUserResult">

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

@@ -119,7 +119,7 @@
     <select id="selectGalleryDtoThumbnail" resultMap="GalleryDtoMap">
         SELECT
         zg.*,
-        zf.thumbnail_url as url,
+        ifnull(zf.thumbnail_url,zf.url) as url,
         zgi.watermark_type,
         zgi.location,
         zgi.author,