From 929e9fedb97a88ef122100e03f775fedae79c474 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 04 六月 2025 15:08:53 +0800
Subject: [PATCH] 更新
---
src/main/java/com/product/mobile/core/service/SysMessageService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/SysMessageService.java b/src/main/java/com/product/mobile/core/service/SysMessageService.java
index 447cc98..489b877 100644
--- a/src/main/java/com/product/mobile/core/service/SysMessageService.java
+++ b/src/main/java/com/product/mobile/core/service/SysMessageService.java
@@ -1,7 +1,7 @@
package com.product.mobile.core.service;
import com.product.admin.config.CmnConst;
-import com.product.admin.service.PublicService;
+import com.product.common.lang.StringUtils;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -35,13 +35,15 @@
*/
public DataTableEntity listReadMessage(FieldSetEntity fse) {
ArrayList <Object> ps= new ArrayList<Object>();
+ String readType = StringUtils.isEmpty(fse.getString("read")) ? "1" : fse.getString("read");
+ ps.add(readType);
ps.add(SpringMVCContextHolder.getCurrentUserId());
StringBuilder f=new StringBuilder();
if(fse.getString("type")!=null) {
f.append(" and SUBSTRING(m.message_type,1,1)=?");
ps.add(fse.getString("type"));
}
- if(fse.getString("key")!=null) {
+ if(!StringUtils.isEmpty(fse.getString("key"))) {
f.append( " and (title like concat('%',?,'%') or content like concat('%',?,'%') or user_name like concat('%',?,'%') ) ");
ps.add(fse.getString("key"));
ps.add(fse.getString("key"));
@@ -51,7 +53,7 @@
sql.append("\nselect m.uuid,m.title,m.content,m.send_user_id,mu.user_name send_user_name,m.send_time,m.message_type,ifnull(m.url,'') url,source_table,source_uuid,thumbnail_img ");
sql.append("\nfrom product_sys_message m");
sql.append("\nleft join product_sys_users mu on mu.user_id=m.send_user_id ");
- sql.append("\ninner join product_sys_message_user u on u.message_uuid=m.uuid and u.read_type=1 and u.user_id=? ").append(f);
+ sql.append("\ninner join product_sys_message_user u on u.message_uuid=m.uuid and ifnull(u.read_type, 0)=? and u.user_id=? ").append(f);
sql.append("\norder by m.send_time desc");
DataTableEntity dte = baseDao.listTable(sql.toString(), ps.toArray(), fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
dte.getMeta().addAliasTable("product_sys_message", "m");
@@ -72,7 +74,7 @@
* @return
*/
public DataTableEntity getTypeMessage(Object type,int read) {
-
+
ArrayList<Object> ps= new ArrayList<Object>();
ps.add(SpringMVCContextHolder.getCurrentUserId());
ps.add(read);
@@ -82,10 +84,10 @@
ps.add(type);
}
StringBuilder sql = new StringBuilder();
- sql.append("\nselect SUBSTRING(message_type,1,1) message_type, count(*) num from product_db_lift.product_sys_message m inner join product_db_lift.product_sys_message_user u on u.message_uuid=m.uuid \r\n"
+ sql.append("\nselect SUBSTRING(message_type,1,1) message_type, count(*) num from product_sys_message m inner join product_sys_message_user u on u.message_uuid=m.uuid \r\n"
+ "and u.user_id=? and u.read_type=?").append(f).append(" group by SUBSTRING(message_type,1,1) ");
DataTableEntity dte = baseDao.listTable(sql.toString(),ps.toArray(),Integer.MAX_VALUE, 1);
return dte;
}
-
+
}
--
Gitblit v1.9.2