合并分支 'master' 到 'fix_bug_first_stage'

Master

查看合并请求 laws-nio/laws-weilai!74

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -4746,7 +4746,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
-        String title = StringUtils.join(hrefList, ",") +  "has been pushed to you, please check";
+        String title = StringUtils.join(serialNumberList, ",") +  "has been pushed to you, please check";
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java

@@ -108,6 +108,7 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 
 		for (Object data : dataList) {
 			lawsOpinionAssessmentResult = JSONObject.parseObject(JSONObject.toJSONString(data),LawsOpinionAssessmentResultEO.class);
+			lawsOpinionAssessmentResult.setSubmitTime(new Date());
 			lawsOpinionAssessmentResultEOList.add(lawsOpinionAssessmentResult);
 		}