From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
index 0745cb3..b8667b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java
@@ -7,7 +7,6 @@
import org.springframework.stereotype.Service;
-import com.yeshi.fanli.dao.config.SystemZnxDao;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.msg.UserSystemMsgMapper;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
@@ -17,6 +16,7 @@
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -32,7 +32,7 @@
private UserInfoMapper userInfoMapper;
@Resource
- private SystemZnxDao systemZnxDao;
+ private SystemZnxService systemZnxService;
@Override
public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,
@@ -117,8 +117,8 @@
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
if (user == null)
return;
- long createtTime = user.getCreatetime();
- List<SystemZnx> list = systemZnxDao.list("from SystemZnx s where s.createTime>=" + createtTime);
+ long createTime = user.getCreatetime();
+ List<SystemZnx> list = systemZnxService.listbyCreateTime(createTime);
if (list != null && list.size() > 0) {
for (SystemZnx znx : list) {
UserSystemMsg msg = userSystemMsgMapper.selectBySystemZNXId(znx.getId());
--
Gitblit v1.8.0