commit
This commit is contained in:
@@ -203,6 +203,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
|
|||||||
// 修改现有用户
|
// 修改现有用户
|
||||||
u.setId(user.getId());
|
u.setId(user.getId());
|
||||||
u.setMember(null);
|
u.setMember(null);
|
||||||
|
u.setMemberTime(null);
|
||||||
|
|
||||||
// 更新会员状态
|
// 更新会员状态
|
||||||
/* boolean currentIsMember = user.getMember() != null && user.getMember();
|
/* boolean currentIsMember = user.getMember() != null && user.getMember();
|
||||||
@@ -384,7 +385,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
|
|||||||
log.info("全量更新用户数据完成,耗时: {} 毫秒", (endTime - startTime));
|
log.info("全量更新用户数据完成,耗时: {} 毫秒", (endTime - startTime));
|
||||||
|
|
||||||
return "更新完成: 新增用户 " + needInitUserList.size() + " 个, 更新用户 " + needDoUpdateList.size()
|
return "更新完成: 新增用户 " + needInitUserList.size() + " 个, 更新用户 " + needDoUpdateList.size()
|
||||||
+ " 个, 待添加会员 " + addMemberUserIds.size() + " 个, 待移除会员 " + removeMemberUserIds.size() + " 个";
|
+ " 个, 待添加会员 " + addMemberUserIds.size() + " 个, 待移除会员 " + removeMemberUserIds.size() + " 个";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -470,8 +471,8 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
|
|||||||
// 生成变更信息描述
|
// 生成变更信息描述
|
||||||
String changeInfos = changeList.stream()
|
String changeInfos = changeList.stream()
|
||||||
.map(v -> v.getString("fieldName", "") + ":" +
|
.map(v -> v.getString("fieldName", "") + ":" +
|
||||||
HtmlUtil.cleanHtmlTag(v.getString("sourceValue", "")) + "→" +
|
HtmlUtil.cleanHtmlTag(v.getString("sourceValue", "")) + "→" +
|
||||||
HtmlUtil.cleanHtmlTag(v.getString("newValue", "")))
|
HtmlUtil.cleanHtmlTag(v.getString("newValue", "")))
|
||||||
.collect(Collectors.joining(";"));
|
.collect(Collectors.joining(";"));
|
||||||
|
|
||||||
// 设置历史记录信息
|
// 设置历史记录信息
|
||||||
|
|||||||
Reference in New Issue
Block a user