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() {