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

edu-common/src/main/java/com/keao/edu/common/service/impl/BaseServiceImpl.java

@@ -155,6 +155,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 			if(ps!=null){
 				ps.close();
 			}
+			if(null!=connection){
+				connection.close();
+			}
 			if(sqlSession!=null){
 				sqlSession.close();
 			}
@@ -217,6 +220,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 			if(ps!=null){
 				ps.close();
 			}
+			if(null!=connection){
+				connection.close();
+			}
 			if(sqlSession!=null){
 				sqlSession.close();
 			}
@@ -249,6 +255,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 			if(ps!=null){
 				ps.close();
 			}
+			if(null!=connection){
+				connection.close();
+			}
 			if(sqlSession!=null){
 				sqlSession.close();
 			}

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

@@ -154,7 +154,7 @@
 			exam_manual_ledger
 		WHERE
 			examination_basic_id_ = #{examId}
-			AND organ_id_ = #{organId}
+			AND target_organ_id_ = #{organId}
 			AND trans_direction_ = 'EXPENDITURE'
 	</select>
 </mapper>