|
@@ -65,8 +65,6 @@ namespace GxPress.Service.Implement.AdminVerify
|
|
|
var groupUsers = await _groupUserRepository.GetAllAsync(Q.Where(nameof(GroupUser.GroupId), group.Id).WhereIn(nameof(GroupUser.GroupUserRoleId), ids));
|
|
|
foreach (var userId in request.UserIds)
|
|
|
{
|
|
|
- var adminVerify = new Entity.AdminVerify();
|
|
|
- var adminVerifyDto = new Entity.AdminVerify();
|
|
|
//获取用户
|
|
|
var user = users.FirstOrDefault(n => n.Id == userId);
|
|
|
if (user == null)
|
|
@@ -87,37 +85,41 @@ namespace GxPress.Service.Implement.AdminVerify
|
|
|
{
|
|
|
//设置群主验证
|
|
|
//await InsertMiddleVerify(groupUser.UserId);
|
|
|
- adminVerifyDto.AvatarUrl = StringUtils.RemoveDomain(user.AvatarUrl);
|
|
|
- adminVerifyDto.SourceName = group.Name;
|
|
|
- adminVerifyDto.Name = user.Name;
|
|
|
- adminVerifyDto.DisposeType = AdminVerifyTypeConst.UDispose.GetHashCode();
|
|
|
- adminVerifyDto.VerifyType = request.VerifyType;
|
|
|
- adminVerifyDto.AdminId = groupUser.UserId;
|
|
|
- adminVerifyDto.SourceType = request.SourceType;
|
|
|
- adminVerifyDto.SourceId = request.SourceId;
|
|
|
- adminVerifyDto.UserId = userId;
|
|
|
- adminVerifyDto.IsDelete = "";
|
|
|
- //获取部门
|
|
|
- adminVerifyDto.Remark = department.Name + "-" + user.Name;
|
|
|
- adminVerifyDto.Remark = request.Remark;
|
|
|
- adminVerifys.Add(adminVerifyDto);
|
|
|
+ var adminVerify = new Entity.AdminVerify()
|
|
|
+ {
|
|
|
+ AvatarUrl = StringUtils.RemoveDomain(user.AvatarUrl),
|
|
|
+ SourceName = group.Name,
|
|
|
+ Name = user.Name,
|
|
|
+ DisposeType = AdminVerifyTypeConst.UDispose.GetHashCode(),
|
|
|
+ VerifyType = request.VerifyType,
|
|
|
+ AdminId = groupUser.UserId,
|
|
|
+ SourceType = request.SourceType,
|
|
|
+ SourceId = request.SourceId,
|
|
|
+ UserId = userId,
|
|
|
+ IsDelete = "",
|
|
|
+ Remark = request.Remark
|
|
|
+ };
|
|
|
+ adminVerifys.Add(adminVerify);
|
|
|
}
|
|
|
}
|
|
|
//邀请
|
|
|
if (request.SourceType == 2)
|
|
|
{
|
|
|
- adminVerify.AvatarUrl = StringUtils.RemoveDomain(userDto.AvatarUrl);
|
|
|
- adminVerify.Name = userDto.Name;
|
|
|
- adminVerify.DisposeType = AdminVerifyTypeConst.UDispose.GetHashCode();
|
|
|
- adminVerify.VerifyType = request.VerifyType;
|
|
|
- adminVerify.AdminId = userId;
|
|
|
- adminVerify.SourceType = request.SourceType;
|
|
|
- adminVerify.SourceId = request.SourceId;
|
|
|
- adminVerify.UserId = request.UserId;
|
|
|
- adminVerify.SourceName = group.Name;
|
|
|
- adminVerify.IsDelete = "";
|
|
|
- //获取部门
|
|
|
- adminVerify.Remark = department.Name + "-" + userDto.Name;
|
|
|
+ var adminVerify = new Entity.AdminVerify()
|
|
|
+ {
|
|
|
+ AvatarUrl = StringUtils.RemoveDomain(userDto.AvatarUrl),
|
|
|
+ Name = userDto.Name,
|
|
|
+ DisposeType = AdminVerifyTypeConst.UDispose.GetHashCode(),
|
|
|
+ VerifyType = request.VerifyType,
|
|
|
+ AdminId = userId,
|
|
|
+ SourceType = request.SourceType,
|
|
|
+ SourceId = request.SourceId,
|
|
|
+ UserId = request.UserId,
|
|
|
+ SourceName = group.Name,
|
|
|
+ IsDelete = "",
|
|
|
+ //获取部门
|
|
|
+ Remark = department.Name + "-" + userDto.Name
|
|
|
+ };
|
|
|
adminVerifys.Add(adminVerify);
|
|
|
}
|
|
|
}
|