Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -261,9 +261,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             " and blp.train_is_sign = 0" +
             " and blp.person_id = #{userId}) trainCount, " +
 
-            "(SELECT (SELECT count(0) FROM tm_paper tp left join tm_paper_link_branch tpb on tpb.ln_pid = tp.p_id\n" +
-            "where 1=1 and tpb.ln_buid = #{userId} ) - " +
-            "(select count(0) from tm_examdata where e_uid = #{userId})) as notFinishedExam " +
+            "(SELECT (SELECT count(0) FROM tm_paper tp left join tm_paper_link_branch tpb on tpb.ln_pid = tp.p_id " +
+            "  where 1=1 and tpb.ln_buid = #{userId} ) -  " +
+            "  (select count(0) from tm_examdata where e_uid = #{userId} " +
+            "and e_pid in (SELECT p_id FROM tm_paper tp left join tm_paper_link_branch tpb on tpb.ln_pid = tp.p_id " +
+            "  where 1=1 and tpb.ln_buid = #{userId} ))) as notFinishedExam " +
             "</script>")
     MyInfoDTO queryMyLessonCount(CurUser curUser);