From 93e1b74a1c1cf734eb454239751fed292ddccaee Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 30 Mar 2023 13:53:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3deleteInstallBot=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0=EF=BC=9A=E4=BC=A0=E5=85=A5=E5=A4=9A?= =?UTF-8?q?=E4=B8=AArepoOwners=E5=B9=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitlink/softbot/service/user/impl/UserService.java | 7 +++++-- .../com/gitlink/softbot/vo/DeleteInstallBotRequest.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java index b8e1e6a..f8b9575 100644 --- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java @@ -844,7 +844,8 @@ public class UserService extends AbstractUserBot implements IUserService { public void deleteInstallBot(DeleteInstallBotRequest deleteInstallBotRequest) throws BotException{ List installBots = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,deleteInstallBotRequest.getBotId()) - .eq(InstallBot::getStoreRepo,deleteInstallBotRequest.getStoreRepo())); + .in(InstallBot::getStoreRepo, Arrays.stream(deleteInstallBotRequest.getStoreRepos().split(",")) + .map(Integer::valueOf).collect(Collectors.toList()))); if (installBots==null||installBots.size()<=0){ throw new BotException("该用户没有要删除的Bot"); } @@ -864,7 +865,9 @@ public class UserService extends AbstractUserBot implements IUserService { //删除install_bot installMapper.delete(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,deleteInstallBotRequest.getBotId()) - .eq(InstallBot::getStoreRepo,deleteInstallBotRequest.getStoreRepo())); + .in(InstallBot::getStoreRepo, Arrays.stream(deleteInstallBotRequest.getStoreRepos().split(",")) + .map(Integer::valueOf).collect(Collectors.toList()))); + //删除webhook for(InstallBot installBot:installBots){ Object[] objects = new Object[]{installBot.getRepoOwner(),installBot.getStoreRepo()}; diff --git a/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java b/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java index e0b8847..c740b81 100644 --- a/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java +++ b/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java @@ -27,6 +27,6 @@ public class DeleteInstallBotRequest { private Integer botId; private String password; - @NotNull(message = "repo is required") - private String storeRepo; + @NotNull(message = "repos is required") + private String storeRepos; }