diff --git a/gan-common/ruoyi-common-core/pom.xml b/gan-common/ruoyi-common-core/pom.xml
index e1bae02..81d27bb 100644
--- a/gan-common/ruoyi-common-core/pom.xml
+++ b/gan-common/ruoyi-common-core/pom.xml
@@ -117,19 +117,6 @@
javax.mail
mail
-
-
- org.thymeleaf
- thymeleaf
-
-
-
-
- gov.nih.nci.cbiit.scimgmt.i2erest.mailsender
- mailclient
- 5.0.1
-
-
diff --git a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/MailUtil.java b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/MailUtil.java
index 77860ab..2204adb 100644
--- a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/MailUtil.java
+++ b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/MailUtil.java
@@ -1,9 +1,6 @@
package com.ruoyi.common.core.utils.mail;
-import gov.nih.nci.cbiit.scimgmt.i2erest.mailsender.resttemplate.MailClientRestTemplateHeaderInterceptor;
-import org.thymeleaf.context.Context;
-
import javax.mail.*;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
index 6615c66..f73a8f0 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
@@ -10,6 +10,7 @@ import com.ruoyi.app.mapper.*;
import com.ruoyi.app.utils.TextAutoRoute;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysUser;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
@Autowired
private AppUserCollectMapper appUserCollectMapper;
+ @Autowired
+ private AppUserMapper userMapper;
+
/**
* 查询App用户动态
*
@@ -164,6 +168,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
List ids = Arrays.asList(appUserDynamicVo.getTopicId().split(","));
appUserDynamicVo.setAppTopicList(appTopicMapper.selectByIdsList(ids));
}
+// if (appUserDynamicVo.getTownId() != null) {
+// // 用户信息
+// SysUser sysUser = userMapper.g(appUserDynamicVo.getAppId());
+// appUserDynamicVo.setSysUser(sysUser);
+// }
+
// 点赞数
AppDynamicLike appDynamicLike = new AppDynamicLike();
appDynamicLike.setDynamicId(id);
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
index 7f4b646..59f0232 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
@@ -51,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.end_time as "endTime",
u.is_member as "isMember",
a.create_time as "createTime",
+ a.town_id as "townId",
+ a.province_id as "provinceId",
+ a.city_id as "cityId",
t.name as "cityName"
from app_user_dynamic a
left join app_user u on u.id = a.user_id