--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

@@ -23,7 +23,7 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 			+ "on m.id = om.id "
 			+ "left join m_Organ o "
 			+ "on om.oid = o.id "
-			+ " where  status != 2"
+			+ " where  status != 2 and level = 2"
 			+ "<if test = '"+NOTBLANK+"(account)' >"
 			+ " and m.account like concat(#{account},'%') "
 			+ "</if>"

com.zrqx.member/src/main/java/com/zrqx/member/bg/pm/service/PrivateMessageServiceImpl.java

@@ -140,7 +140,7 @@ public class PrivateMessageServiceImpl extends BaseServiceImpl<PrivateMessage, I
 			cr.andGreaterThanOrEqualTo("sendTime", form.getBiginReleaserTime());
 		}
 		if (StringUtils.isNotBlank(form.getEndReleaserTime())) {
-			cr.andLessThanOrEqualTo("sendTime", form.getEndReleaserTime());
+			cr.andLessThanOrEqualTo("sendTime", form.getEndReleaserTime()+" 23:59:59");
 		}
 		
 		startPage(pageParam);