Merge branch 'master' into docker_package

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

@@ -454,6 +454,9 @@ public class ActivitiNoticeAspect {
                         type = 1;
                         //待办通知，通知的是流程当前审核人，通知内容：[待办通知]申请部门+申请人+提出“资源名称”+申请，请进入UCS后台管理系统进行审核。
                         content = "【待办通知】" + owner.getDeptName() + owner.getRealName() + "提出 ”" + resourceName + " ”申请，请进入UCS后台管理系统进行审核。";
+                        if (allowEntrust) {
+                            content = content + "（因无法分配到审核人，故当前审核人指派为您，您可进行委托他人转办）";
+                        }
 
                     } else if ("能力资源上架".equals(activitiNoticeOperation.process())) {
                         type = 3;
@@ -464,6 +467,7 @@ public class ActivitiNoticeAspect {
                     } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) {
                         type = 9;
                     }
+                    LOGGER.info("通知内容：{}", content);
                     SysNoticeDTO dto = new SysNoticeDTO();
                     dto.setType(type);
                     dto.setTitle("流程流转系统通知");

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

@@ -296,7 +296,7 @@ public class SysNoticeServiceImpl extends CrudServiceImpl<SysNoticeDao, SysNotic
                 "      <sendpersonGuid>BE604908-D7A3-4947-9CAD-A70FF2E48AB1</sendpersonGuid>\n" +  //没有发送人定义，先写死
                 "      <typeName>其他</typeName>\n" +
                 "      <isout>1</isout>\n" +
-                "      <url>http://15.72.183.90:7008</url>\n" +
+                (StringUtils.isNotBlank(notice.getJumpUrl()) ? "<url>" + notice.getJumpUrl() +"</url>\n" : "<url>http://15.72.183.90:7008</url>\n") +
                 "      <openFlag>1</openFlag>\n" +
                 "      <isReply>0</isReply>\n" +
                 "      <isTop>0</isTop>\n" +