The Total Power sort function does include the affection bonus. My Olive is the only 3* i have with 100% aff, or any at all, and she gets sortet into squad 3, even though i have 4* with roughly 10 levels higher, that get sorted lower. Equipment would need further testing.