初始化组织调整

src/main/java/com/winhc/repal/entity/RepalGroup.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * @date 2022-04-13
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode()
 @Accessors(chain = true)
 @TableName("REPAL_GROUP")
 @ApiModel(value="RepalGroup实体对象", description="回款宝-组织结构")
@@ -49,6 +49,10 @@ public class RepalGroup implements Serializable {
     @TableField("DELETED")
     private Integer deleted;
 
+    @ApiModelProperty(value = "第三方组织id")
+    @TableField("THIRD_GROUP_ID")
+    private String thirdGroupId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("TIME_CREATED")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/winhc/repal/service/impl/RepalGroupServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.common.enums.CodeMsg;
+import com.winhc.common.exception.CommonException;
 import com.winhc.common.model.base.VOPage;
 import com.winhc.repal.constant.Constant;
 import com.winhc.repal.entity.*;
@@ -56,6 +58,9 @@ public class RepalGroupServiceImpl extends ServiceImpl<RepalGroupMapper, RepalGr
     @Autowired
     private RepalVipService repalVipService;
 
+    @Autowired
+    private ThirdPartyAccountService thirdPartyAccountService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean initGroup(InitGroupDTO dto) {
@@ -68,8 +73,15 @@ public class RepalGroupServiceImpl extends ServiceImpl<RepalGroupMapper, RepalGr
             LOGGER.info("已经属于组织成员了, userId:[{}]", dto.getUserId());
             return true;
         }
+        // 查第三方组织id
+        ThirdPartyAccount account = thirdPartyAccountService.getOne(Wrappers.lambdaQuery(ThirdPartyAccount.class)
+                .eq(ThirdPartyAccount::getUserId, dto.getUserId())
+                .eq(ThirdPartyAccount::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
+        if (Objects.isNull(account)) {
+            throw new CommonException(CodeMsg.FAILED, "账号不存在");
+        }
         RepalGroup repalGroup = this.getOne(Wrappers.lambdaQuery(RepalGroup.class)
-                .eq(RepalGroup::getUserId, dto.getUserId())
+                .eq(RepalGroup::getThirdGroupId, account.getGroupId())
                 .eq(RepalGroup::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
         if (Objects.isNull(repalGroup)) {
             // 先初始化组织
@@ -77,6 +89,7 @@ public class RepalGroupServiceImpl extends ServiceImpl<RepalGroupMapper, RepalGr
             repalGroup.setGroupName(dto.getGroupName());
             repalGroup.setUserId(dto.getUserId());
             repalGroup.setGroupExt(dto.getGroupExt());
+            repalGroup.setThirdGroupId(account.getGroupId());
             this.save(repalGroup);
             repalGroupMemberService.addGroupMember(dto.getUserId(), userExt.getUserName(), repalGroup.getId(), 1L, RoleTypeEnum.SYSTEM.getCode());
             // 初始化4个角色