From 4afb130bb6786a81e8eabf7cbf31590027760efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Mon, 28 Apr 2025 10:50:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=88=A0=E9=99=A4=E5=9B=BA=E5=AE=9A=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gd/infrastructure/repository/service/UserService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iflytop/gd/infrastructure/repository/service/UserService.java b/src/main/java/com/iflytop/gd/infrastructure/repository/service/UserService.java index 5b8a40e..0682ed5 100644 --- a/src/main/java/com/iflytop/gd/infrastructure/repository/service/UserService.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/service/UserService.java @@ -1,6 +1,7 @@ package com.iflytop.gd.infrastructure.repository.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.gd.common.enums.FixedUser; import com.iflytop.gd.infrastructure.repository.mapper.UserMapper; import com.iflytop.gd.infrastructure.repository.entity.User; import lombok.Getter; @@ -25,8 +26,14 @@ public class UserService extends ServiceImpl { public boolean deleteUser(String idsStr) { List ids = Arrays.stream(idsStr.split(",")) .map(Long::parseLong) - .collect(Collectors.toList()); - return this.removeByIds(ids); + .toList(); + for (Long id : ids) { + User user = this.getById(id); + if (user != null && user.getFixedUser() != FixedUser.ENABLE) { + return this.removeById(id); + } + } + return true; } public void clearCurrentUser() {