Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -99,9 +99,12 @@
 			<if test="organId!=null and organId!=0">
 				AND organ_id_=#{organId}
 			</if>
-			<if test="targetOrganId!=null">
+			<if test="targetOrganId!=null and targetOrganId!=-99">
 				AND target_organ_id_=#{targetOrganId}
 			</if>
+			<if test="targetOrganId!=null and targetOrganId==-99">
+				AND target_organ_id_ IS NULL
+			</if>
 		</where>
 	</sql>
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -205,7 +205,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			er.status_ NOT IN ('CANCEL')
+			er.status_ NOT IN ('CANCEL', 'PAY_WAIT')
 			<if test="organIds!=null">
 				AND er.organ_id_ IN
 				<foreach collection="organIds" item="organId" separator="," open="(" close=")">