Changes

web/src/main/java/com/jpsoft/employment/modules/base/api/ParticipateApi.java

@@ -117,10 +117,10 @@ public class ParticipateApi {
 
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setId(UUID.randomUUID().toString());
-                newsInfo.setTitle(String.format("【%s】爱心人士%s报名参加了%s合作内容",typeN,regUser.getRealName(),loveProject.getTitle()));
+                newsInfo.setTitle(String.format("【%s】爱心人士%s报名参加了%s合作内容",typeN,regUser.getRealName(),participateProjectInfo.getContent()));
                 newsInfo.setType("5");
                 newsInfo.setIsTop(false);
-                newsInfo.setContent(String.format("【%s】爱心人士%s报名参加了%s合作内容",typeN,regUser.getRealName(),loveProject.getTitle()));
+                newsInfo.setContent(String.format("爱心人士%s报名参加了%s合作内容",regUser.getRealName(),participateProjectInfo.getContent()));
                 newsInfo.setDelFlag(false);
                 newsInfo.setCreateBy(subject);
                 newsInfo.setCreateTime(new Date());

web/src/main/java/com/jpsoft/employment/modules/base/api/VolunteerApi.java

@@ -119,7 +119,7 @@ public class VolunteerApi {
             newsInfo.setTitle(String.format("【志愿征集】爱心人士%s报名参加了志愿活动征集",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2")));
             newsInfo.setType("5");
             newsInfo.setIsTop(false);
-            newsInfo.setContent(String.format("【志愿征集】爱心人士%s报名参加了志愿活动征集",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2")));
+            newsInfo.setContent(String.format("爱心人士%s报名参加了志愿活动征集",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2")));
             newsInfo.setDelFlag(false);
             newsInfo.setCreateBy(subject);
             newsInfo.setCreateTime(new Date());

web/src/main/java/com/jpsoft/employment/modules/base/api/WishApi.java

@@ -246,10 +246,10 @@ public class WishApi {
 
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setId(UUID.randomUUID().toString());
-                newsInfo.setTitle(String.format("【心愿互换】爱心人士%s申请了%s作品互换",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"),studentAspirationsService.get(studentAspirationsId).getStudentName()));
+                newsInfo.setTitle(String.format("【心愿互换】爱心人士%s申请了作品《%s》互换",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"),wishInfo.getTitle()));
                 newsInfo.setType("5");
                 newsInfo.setIsTop(false);
-                newsInfo.setContent(String.format("【心愿互换】爱心人士%s申请了%s作品互换",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"),studentAspirationsService.get(studentAspirationsId).getStudentName()));
+                newsInfo.setContent(String.format("爱心人士%s申请了作品《%s》互换",regUserService.get(subject).getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"),wishInfo.getTitle()));
                 newsInfo.setDelFlag(false);
                 newsInfo.setCreateBy(subject);
                 newsInfo.setCreateTime(new Date());