Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into V5
Browse files Browse the repository at this point in the history
  • Loading branch information
sanluan committed Feb 23, 2023
2 parents 2befd50 + a9046a3 commit 3c51e12
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public String save(@RequestAttribute SysSite site, @SessionAttribute SysUser adm
if (null != entity) {
logOperateService.save(new LogOperate(site.getId(), admin.getId(), admin.getDeptId(),
LogLoginService.CHANNEL_WEB_MANAGER, "update.content", RequestUtils.getIpAddress(request), now,
JsonUtils.getString(new Object[] { entity, attribute, contentParameters })));
JsonUtils.getString(new Object[] { entity, contentParameters })));
}
} else {
service.save(site.getId(), admin, entity);
Expand All @@ -187,7 +187,7 @@ public String save(@RequestAttribute SysSite site, @SessionAttribute SysUser adm
}
logOperateService.save(new LogOperate(site.getId(), admin.getId(), admin.getDeptId(),
LogLoginService.CHANNEL_WEB_MANAGER, "save.content", RequestUtils.getIpAddress(request), now,
JsonUtils.getString(new Object[] { entity, attribute, contentParameters })));
JsonUtils.getString(new Object[] { entity, contentParameters })));
}
entity = service.saveTagAndAttribute(site, admin.getId(), entity.getId(), contentParameters, cmsModel,
category.getExtendId(), attribute);
Expand Down

0 comments on commit 3c51e12

Please sign in to comment.