通知优化 。。

renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java

@@ -322,6 +322,7 @@ public class ActivitiNoticeAspect {
                 SysUserDTO assignee = sysUserService.get(Long.valueOf(delegateTask.getAssignee()));
                 logger.error("审核人：" + assignee.getId());
                 String content = "【通知】您发起的流程 " + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核人为：\"" + assignee.getDeptName() + "\"审核负责人\"" + assignee.getRealName() + "\"";
+                logger.info("通知内容：" + content);
                 SysNoticeDTO dto = new SysNoticeDTO();
                 dto.setType(2);
                 dto.setTitle("流程流转系统通知");

renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java

@@ -83,7 +83,7 @@ public class SysNoticeServiceImpl extends CrudServiceImpl<SysNoticeDao, SysNotic
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    // @Transactional(rollbackFor = Exception.class)
     public void save(SysNoticeDTO dto) {
         SysNoticeEntity entity = ConvertUtils.sourceToTarget(dto, SysNoticeEntity.class);
         if (StringUtils.isEmpty(entity.getFrom())) {

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -282,7 +282,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                                             return resourceDTO1;
                                         }).collect(Collectors.toList()));
                                     } else {
-                                        resultPage.setRecords(null);
+                                        resultPage.setRecords(new ArrayList<>());
                                         resultPage.setTotal(0);
                                     }