From 01e2c982dec2a55fb8666f8cc801dd1540fa62cd Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 21 八月 2023 11:02:01 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0
---
src/main/java/com/product/mobile/core/service/SysMessageService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 741c46a..d422fe3 100644
--- a/src/main/java/com/product/mobile/core/service/SysMessageService.java
+++ b/src/main/java/com/product/mobile/core/service/SysMessageService.java
@@ -1,12 +1,13 @@
package com.product.mobile.core.service;
import com.product.admin.config.CmnConst;
-import com.product.admin.service.UserService;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.module.sys.service.UserService;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,7 +32,7 @@
*/
public DataTableEntity listReadMessage(FieldSetEntity fse) {
StringBuilder sql = new StringBuilder();
- 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,m.mobile_url url ");
+ 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.mobile_url,'') url ");
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=?");
@@ -44,7 +45,7 @@
FieldSetEntity tempFse;
for (int i = 0;i < dte.getRows();i++) {
tempFse = dte.getFieldSetEntity(i);
- tempFse.setValue("sender_avatar", userService.getUserAvatar(tempFse.getString("send_user_id")));
+ tempFse.setValue(com.product.core.websocket.config.CmnConst.SEND_THUMBNAIL_IMG, userService.getUserAvatar(tempFse.getString("send_user_id_save_value")));
}
return dte;
--
Gitblit v1.9.2