Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserBindingTeacherMapper.xml

@@ -9,11 +9,12 @@
         su.avatar_ AS avatar,
         su.phone_ AS phone,
         (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,s.subject_id_)) AS subjectName,
-        IFNULL(TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()),TIMESTAMPDIFF(DAY,b.created_time_,NOW())) AS lastEndClass
+--         IFNULL(TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()),TIMESTAMPDIFF(DAY,b.created_time_,NOW())) AS lastEndClass
+        TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()) AS lastEndClass
         FROM user_binding_teacher b
         LEFT JOIN sys_user su ON b.student_id_=su.id_
         LEFT JOIN student s ON b.student_id_=s.user_id_
-        WHERE b.last_end_class_ IS NOT NULL
+        <where>
         <if test="param.subjectId != null">
            AND find_in_set(#{param.subjectId},s.subject_id_)
         </if>
@@ -29,6 +30,7 @@
                 #{item.userId}
             </foreach>
         </if>
+        </where>
     </select>
 
     <!-- 表字段 -->