Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/ekexiu/portal/leavemsg/Service.java

@@ -300,7 +300,7 @@ public class Service {
	@Path("/counts")
	public List<Map<String, Object>> query(@JdbcConn Connection con, final String stype, final String[] ids) throws SQLException {
		StringBuilder sb = new StringBuilder();
		sb.append("SELECT REF_ID rid,COUNT(1) num FROM LEAVE_MSG WHERE REF_TYPE =? AND REF_ID IN (?");
		sb.append("SELECT REF_ID rid,COUNT(1) num FROM LEAVE_MSG WHERE STATE='1' AND REF_TYPE =? AND REF_ID IN (?");
		for (int i = 1; i < ids.length; ++i) {
			sb.append(",?");
		}