diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml index aed8cd0b63..0d3eb62cd0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserMapper.xml @@ -16,6 +16,6 @@ `user` u LEFT JOIN user_role_relation urr ON u.id = urr.user_id WHERE - urr.source_id = #{sourceId} + urr.source_id = #{sourceId} and u.deleted = false \ No newline at end of file diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java index 97369276cb..3cf16e7610 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java @@ -299,6 +299,7 @@ public class UserService { public List getUserList() { UserExample example = new UserExample(); + example.createCriteria().andDeletedEqualTo(false); example.setOrderByClause("update_time desc"); return userMapper.selectByExample(example); }