Browse Source

APP首页(消息推送) 显示修复

Michael 8 years ago
parent
commit
30f04237fb

+ 4 - 4
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -579,7 +579,7 @@
 						a.message_id = b.id
 					where
 						consumer_id = #{uid,jdbcType=VARCHAR}
-						and a.read_time is not null
+						and a.read_time is null
 						and a.delete_sign = 0
 						and b.subject = 1
 					order by
@@ -593,7 +593,7 @@
 						a.message_id = b.id
 					where
 						consumer_id = #{uid,jdbcType=VARCHAR}
-						and a.read_time is not null
+						and a.read_time is null
 						and a.delete_sign = 0
 						and b.subject = 1
 				) t2 on
@@ -615,7 +615,7 @@
 						a.message_id = b.id
 					where
 						consumer_id = #{uid,jdbcType=VARCHAR}
-						and a.read_time is not null
+						and a.read_time is null
 						and a.delete_sign = 0
 						and b.subject = 2
 					order by
@@ -629,7 +629,7 @@
 						a.message_id = b.id
 					where
 						consumer_id = #{uid,jdbcType=VARCHAR}
-						and a.read_time is not null
+						and a.read_time is null
 						and a.delete_sign = 0
 						and b.subject = 2
 				) t4 on

+ 2 - 2
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -314,11 +314,11 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<MessageListBo> listPersonalMessage(Integer subject, Integer sourceType,Integer pageNo,Integer pageSize) {
+	public Pagination<MessageListBo> listPersonalMessage(Integer subject, Integer resourceType,Integer pageNo,Integer pageSize) {
 		if(subject == SubjectType.KE_HU.getTypeCode() || subject == SubjectType.TUI_JIAN.getTypeCode()){
 			Map<String,Object> params = new HashMap<String, Object>();
 			if(null != subject) params.put("subject", subject);
-			if(null != sourceType) params.put("sourceType", sourceType);
+			if(null != resourceType) params.put("resourceType", resourceType);
 			params.put("uid", TokenManager.getUserId());
 			return (Pagination<MessageListBo>)findPage("listPersonalMessageByPage", "listPersonalMessageCount", params, pageNo, pageSize);
 		}