Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -187,6 +187,6 @@
         SELECT name_ FROM organization WHERE id_ = #{organId}
     </select>
     <select id="findUserBySalt" resultMap="SysUser">
-        SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND user_type_ = #{userType} LIMIT 1
+        SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND salt_ != '' AND user_type_ = #{userType} LIMIT 1
     </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -623,8 +623,10 @@
         FROM
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
+            LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE
           csts.user_id_ = #{teacherId}
+          AND cg.del_flag_ = 0
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>