1,解决删除用户保留信息时错误问题;2,server api获取用户信息时,可以指定获取包含被删除用户。

This commit is contained in:
heavyrian2012
2026-02-03 19:51:03 +08:00
parent 52b624f25e
commit 8322134e18
5 changed files with 35 additions and 4 deletions
@@ -35,6 +35,9 @@ public class ThreadPoolExecutorWrapper {
executor.execute(() -> {
try {
task.run();
} catch (Exception e) {
e.printStackTrace();
LOG.info("execute error = {}", e.toString());
} finally {
int endCount = runCounter.decrementAndGet();
LOG.debug("Finish task and current task count {} use time {}", endCount, System.currentTimeMillis()-startTime);
@@ -49,7 +49,7 @@ public class GetUserAction extends AdminAction {
}
RestResult result;
if (user == null || user.getDeleted() > 0) {
if (user == null || (user.getDeleted() > 0 && !inputUserId.isIncludeDeleted())) {
result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
} else {
result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
@@ -3176,7 +3176,7 @@ public class MemoryMessagesStore implements IMessagesStore {
IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
WFCMessage.User us = mUserMap.get(userId);
if (us != null) {
WFCMessage.User.Builder builder = WFCMessage.User.newBuilder().setUpdateDt(System.currentTimeMillis()).setDeleted(1);
WFCMessage.User.Builder builder = us.toBuilder().setUpdateDt(System.currentTimeMillis()).setDeleted(1);
if(keepFullInfoWhenDestroyUser) {
if(!keepMobileWhenDestroyUser) {