diff --git a/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java index 9b733535..86a54fdc 100644 --- a/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/ExportServiceImpl.java @@ -186,8 +186,8 @@ public class ExportServiceImpl implements ExportService { try { String fileName = "项目运行报告.docx"; - String path = "C:/Users/zzc16/Desktop/项目运行报告.docx"; -// String path = "D:/Projects/research/server/profile/项目运行报告.docx"; +// String path = "C:/Users/zzc16/Desktop/项目运行报告.docx"; + String path = "D:/Projects/research/server/profile/项目运行报告.docx"; template.render(map); //以文件形式输出 template.writeAndClose(Files.newOutputStream(Paths.get(path))); diff --git a/research-system/src/main/java/com/research/system/service/impl/SessionServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/SessionServiceImpl.java index 77431f88..9840c01d 100644 --- a/research-system/src/main/java/com/research/system/service/impl/SessionServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/SessionServiceImpl.java @@ -185,10 +185,16 @@ public class SessionServiceImpl implements SessionService { @Override public Long addSession(SessionDto.CreateSession dto) { + String createBy = "admin"; + try { + createBy = SecurityUtils.getUsername(); + }catch (Exception e) { + System.out.println("未登录"); + } ChatSessions chatSessions = new ChatSessions(); chatSessions.setSessionName(dto.getSessionName()); chatSessions.setSessionType(dto.getType().byteValue()); - chatSessions.setCreatedBy(dto.getLoginUserId()); + chatSessions.setCreatedBy(dto.getLoginUserId() == null ? SecurityUtils.getUserId() : dto.getLoginUserId()); chatSessions.setCreatedAt(new java.util.Date()); if (dto.getType() == 0) { SysUser sysUser = sysUserService.selectUserById(dto.getMemberList().get(0)); @@ -196,7 +202,7 @@ public class SessionServiceImpl implements SessionService { chatSessions.setAvatarUrl(sysUser.getAvatar()); } } - chatSessions.setCreateBy("system"); + chatSessions.setCreateBy(createBy); chatSessions.setId(IdUtil.getSnowflakeNextId()); chatSessionsMapper.insertSelective(chatSessions); @@ -214,7 +220,7 @@ public class SessionServiceImpl implements SessionService { chatSessionMembers.setIsCreator(Objects.equals(aLong, dto.getLoginUserId()) ? (byte) 1 : (byte) 0); chatSessionMembers.setIsAdmin(Objects.equals(aLong, dto.getLoginUserId()) ? (byte) 1 : (byte) 0); chatSessionMembers.setSessionAlias(""); - chatSessionMembers.setCreateBy("system"); + chatSessionMembers.setCreateBy(createBy); chatSessionMembers.setCreateTime(new java.util.Date()); chatSessionMembersMapper.insertSelective(chatSessionMembers); }