Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

7 天以前 2e183f8b71d7170b12346b8c231811c828819fda

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

@@ -153,13 +153,18 @@
   <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="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
      <include refid="selectUserVo"/>
      where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
          #{item}
        </foreach>
      and u.del_flag = '0'
   </select>
    <select id="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
        <include refid="selectUserVo"/>
        <where>
            <if test="userIds != null and userIds.size > 0">
                and u.user_id in
                <foreach collection="userIds" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            and u.del_flag = '0'
        </where>
    </select>
   <select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
      SELECT user_id, nick_name FROM sys_user
      <where>