|
|
@@ -9,6 +9,7 @@ import com.winhc.repal.constant.Constant;
|
|
|
import com.winhc.repal.entity.RepalBook;
|
|
|
import com.winhc.repal.entity.RepalGroup;
|
|
|
import com.winhc.repal.entity.RepalGroupMember;
|
|
|
+import com.winhc.repal.entity.UserExt;
|
|
|
import com.winhc.repal.enums.DeletedStatusEnum;
|
|
|
import com.winhc.repal.enums.RoleTypeEnum;
|
|
|
import com.winhc.repal.model.dto.InitGroupDTO;
|
|
|
@@ -29,8 +30,8 @@ import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
- * @description RepalGroup 接口实现类
|
|
|
* @author Generator
|
|
|
+ * @description RepalGroup 接口实现类
|
|
|
* @date 2022-04-13
|
|
|
*/
|
|
|
@Service
|
|
|
@@ -50,9 +51,13 @@ public class RepalGroupServiceImpl extends ServiceImpl<RepalGroupMapper, RepalGr
|
|
|
@Autowired
|
|
|
private RepalGroupRoleService repalGroupRoleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserExtService userExtService;
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean initGroup(InitGroupDTO dto) {
|
|
|
+ UserExt userExt = userExtService.getById(dto.getUserId());
|
|
|
// member判断
|
|
|
if (repalGroupMemberService.count(Wrappers.lambdaQuery(RepalGroupMember.class)
|
|
|
.eq(RepalGroupMember::getUserId, dto.getUserId())
|
|
|
@@ -70,7 +75,7 @@ public class RepalGroupServiceImpl extends ServiceImpl<RepalGroupMapper, RepalGr
|
|
|
repalGroup.setUserId(dto.getUserId());
|
|
|
repalGroup.setGroupExt(dto.getGroupExt());
|
|
|
this.save(repalGroup);
|
|
|
- repalGroupMemberService.addGroupMember(dto.getUserId(), dto.getUserName(), repalGroup.getId(), 1L, RoleTypeEnum.SYSTEM.getCode());
|
|
|
+ repalGroupMemberService.addGroupMember(dto.getUserId(), userExt.getUserName(), repalGroup.getId(), 1L, RoleTypeEnum.SYSTEM.getCode());
|
|
|
// 初始化4个角色
|
|
|
for (int i = 0; i < Constant.INIT_ROLE_NAME_LIST.size(); i++) {
|
|
|
MemberRoleDTO memberRoleDTO = new MemberRoleDTO();
|
xda