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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml

@@ -42,7 +42,7 @@
            and bu.tenant_id = #{user.tenantId}
        </if>
        <if test="user.account!=null and user.account != ''">
            and bu.account = #{user.account}
            and bu.account like concat('%',#{user.account},'%')
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and bu.real_name like concat(concat('%',#{user.realName}),'%')
@@ -139,6 +139,30 @@
        SELECT * FROM BLADE_USER
        WHERE IS_DELETED = 0 AND PHONE LIKE CONCAT('%',#{phoneIds},'%')
    </select>
    <select id="getSysUserNum" resultType="java.lang.Integer">
            select count(*) from (
                select bu.id from blade_user bu
                where bu.is_deleted = 0
                <if test="deptIdList!=null and deptIdList.size()>0">
                    and id in (
                    SELECT
                    user_id
                    FROM
                    blade_user_dept
                    WHERE
                    dept_id IN
                    <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
                        #{item}
                    </foreach>
                    )
                </if>
            )

    </select>






</mapper>