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

liyong

昨天 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -15,6 +15,7 @@
        <result property="password"     column="password"     />
        <result property="status"       column="status"       />
        <result property="delFlag"      column="del_flag"     />
        <result property="aiEnabled"    column="ai_enabled"   />
        <result property="loginIp"      column="login_ip"     />
        <result property="loginDate"    column="login_date"   />
        <result property="createBy"     column="create_by"    />
@@ -48,7 +49,7 @@
    </resultMap>

   <sql id="selectUserVo">
        select u.user_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.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.ai_enabled, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_id
        from sys_user u
          left join sys_user_role ur on u.user_id = ur.user_id
@@ -153,13 +154,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>