Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

2 天以前 9f99167aba3720cb731298511f8423b18c08e5a2

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

@@ -139,6 +139,7 @@
   <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
      <include refid="selectUserVo"/>
      where u.user_id = #{userId}
      and u.del_flag = '0'
   </select>

   <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -157,6 +158,7 @@
      where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
          #{item}
        </foreach>
      and u.del_flag = '0'
   </select>
   <select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
      SELECT user_id, nick_name FROM sys_user
@@ -179,6 +181,7 @@
      <foreach collection="userIds" item="id" open="(" separator="," close=")">
         #{id}
      </foreach>
      and del_flag = '0'
   </select>
   <select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
         parameterType="java.lang.String">