fengji fix bug 2060

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMessageDao.java

@@ -41,7 +41,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType);
+	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 修改用户所有消息阅读状态

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -126,7 +126,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType);
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType, Integer tenantId);
 
 	/**
 	 *

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -550,8 +550,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType) {
-		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId,jpushType);
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId, String jpushType, Integer tenantId) {
+		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId, jpushType, tenantId);
 
 		Map<String, Integer> map = new HashMap<String, Integer>();
 

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -192,6 +192,7 @@
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
 		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		AND tenant_id_ = #{tenantId}
 		AND (jpush_type_ = #{jpushType} OR jpush_type_ IS NULL)
 		<if test="type != null">
 		and type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -94,7 +94,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed("请重新登录");
 		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER");
+		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER", sysUser.getTenantId());
 
 		if (map == null || map.size() == 0) {
 			return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -95,6 +95,6 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null));
+		return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null, sysUser.getTenantId()));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/SysEduMessageController.java

@@ -105,7 +105,7 @@ public class SysEduMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed("请重新登录");
 		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SYSTEM");
+		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SYSTEM", sysUser.getTenantId());
 
 		if (map == null || map.size() == 0) {
 			return succeed();