From 69b3a5f465c9231ed33974b730b3eafe40e03f54 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Thu, 21 Aug 2025 18:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=8D=95=E7=8B=AC=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=9B=BD=E5=AE=B6fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/guild/GuildApplyAdminService.java | 2 +- .../service/guild/GuildManageAdminService.java | 14 ++++++-------- .../guild/GuildManageAdminController.java | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java index e1d402d8b..419464fcf 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java @@ -226,7 +226,7 @@ public class GuildApplyAdminService { applyServiceById.setAdminId(admindId); boolean b = guildApplyService.updateById(applyServiceById); if (b) { - Integer guildId = guildManageAdminService.addGuildInfo(users, applyServiceById.getApplyTime(), admindId, null, null, applyServiceById.getInviteUid(), applyServiceById, null); + Integer guildId = guildManageAdminService.addGuildInfo(users, applyServiceById.getApplyTime(), admindId, null, null, applyServiceById.getInviteUid(), applyServiceById, null, null); applyServiceById.setGuildId(guildId); guildApplyService.updateById(applyServiceById); String rejectSys = I18NMessageSourceUtil.getMessage(I18nAlertEnum.GUILD_APPLY_PASS, users.getPartitionId()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java index 848ca2078..2f3d68292 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java @@ -87,8 +87,7 @@ public class GuildManageAdminService { @Transactional(rollbackFor = Exception.class) public void createGuild(Long erbanNo, Integer adminId, String guildContactType, String guildContact, - Long inviteErbanNo, - Integer operatorId) { + Long inviteErbanNo, Integer operatorId, Integer regionId) { Users u = usersService.getUserByErbanNo(erbanNo); if (null == u){ throw new AdminServiceException(BusiStatus.USERNOTEXISTS); @@ -124,7 +123,7 @@ public class GuildManageAdminService { } Date now = new Date(); - int guildId = addGuildInfo(u, now, adminId, guildContactType, guildContact, inviteUid,null, operatorId); + int guildId = addGuildInfo(u, now, adminId, guildContactType, guildContact, inviteUid,null, operatorId, regionId); guildOperatorHistoryAdminService.addGuildRef(guildId, u.getPartitionId(), operatorId, adminId); } @@ -140,9 +139,8 @@ public class GuildManageAdminService { * @param operatorId * @return */ - public Integer addGuildInfo(Users u, Date now, Integer adminId, - String guildContactType, String guildContact, - Long inviteUid, GuildApply guildApply, Integer operatorId) { + public Integer addGuildInfo(Users u, Date now, Integer adminId, String guildContactType, String guildContact, + Long inviteUid, GuildApply guildApply, Integer operatorId, Integer regionId) { Guild guild = new Guild(); guild.setPartitionId(u.getPartitionId()); guild.setOwnerUid(u.getUid()); @@ -169,7 +167,7 @@ public class GuildManageAdminService { guild.setAvatar(u.getAvatar()); } guild.setOperatorId(operatorId); - guild.setRegionId(u.getRegionId()); + guild.setRegionId(regionId == null ? u.getRegionId() : regionId); guildService.save(guild); applicationContext.publishEvent(new NewGuildEvent(new NewGuildMessage(u.getPartitionId(), guild.getId(), u.getUid(), now))); @@ -390,7 +388,7 @@ public class GuildManageAdminService { vo.setOwnerErbanNo(u.getErbanNo()); vo.setOwnerNick(u.getNick()); vo.setOwnerPartitionName(partitionNameMap.get(u.getPartitionId())); - vo.setOwnerRegionName(regionNameMap.get(guild.getRegionId())); + vo.setOwnerRegionName(regionNameMap.get(u.getRegionId())); } vo.setPartitionId(guild.getPartitionId()); vo.setRegionId(guild.getRegionId()); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java index 4216cfe54..86f24200a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java @@ -50,12 +50,12 @@ public class GuildManageAdminController extends BaseController { String guildContactType, String guildContact, Long inviteErbanNo, - Integer operatorId){ + Integer operatorId, Integer regionId){ if (null == erbanNo){ throw new AdminServiceException(BusiStatus.PARAMERROR); } Integer adminId = getAdminId(); - service.createGuild(erbanNo, adminId, guildContactType, guildContact, inviteErbanNo, operatorId); + service.createGuild(erbanNo, adminId, guildContactType, guildContact, inviteErbanNo, operatorId, regionId); adminLogService.insertLog(adminId,getClass().getCanonicalName(), "create guild","params===>>erbanNo:"+erbanNo); return BusiResult.success();