Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

common/src/main/java/com/ccsens/common/bean/dto/CShareDto.java

@@ -39,7 +39,7 @@ public class CShareDto {
     }
 
     @Data
-    @ApiModel("点击分享链接")
+    @ApiModel("查询分享的成员")
     public static class QueryMemberByShare {
         @NotNull(message = "请选择项目")
         @ApiModelProperty("项目id")

common/src/main/java/com/ccsens/common/persist/dao/ProShareMemberDao.java

@@ -5,6 +5,8 @@ import com.ccsens.common.persist.mapper.ProShareMemberMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ProShareMemberDao extends ProShareMemberMapper {
     /**
@@ -21,5 +23,5 @@ public interface ProShareMemberDao extends ProShareMemberMapper {
      * @param type 用户类型
      * @return 记录信息
      */
-    ProShareMember queryByMemberIdAndType(@Param("memberId") Long userOfMemberId,@Param("type") Byte type);
+    List<ProShareMember> queryByMemberIdAndType(@Param("memberId") Long userOfMemberId, @Param("type") Byte type);
 }

common/src/main/java/com/ccsens/common/service/ShareService.java

@@ -1,5 +1,6 @@
 package com.ccsens.common.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
@@ -134,13 +135,26 @@ public class ShareService implements IShareService{
         proShareMember.setShareId(projectShare.getId());
         proShareMember.setUserId(userId);
         Byte type = 0;
-        ProShareMember typeOfZero = shareMemberDao.queryByMemberIdAndType(userOfMemberId,type);
+        List<ProShareMember> typeOfZero = shareMemberDao.queryByMemberIdAndType(userOfMemberId,type);
-        if (ObjectUtil.isNotNull(typeOfZero)){
+        if (CollectionUtil.isNotEmpty(typeOfZero)){
             proShareMember.setType((byte)0);
         }else{
             proShareMember.setType((byte)1);
         }
         shareMemberDao.insertSelective(proShareMember);
+        ProRoleMember newRoleMember = new ProRoleMember();
+        newRoleMember.setId(snowflake.nextId());
+        newRoleMember.setRoleId(projectShare.getRoleId());
+        newRoleMember.setMemberId(roleMember.getId());
+        roleMemberDao.insertSelective(newRoleMember);
+        ProjectDto.SaveUserProject userProject = new ProjectDto.SaveUserProject();
+        List<Long> projects = new ArrayList<>();
+        projects.add(projectShare.getProjectId());
+        userProject.setProjectId(projects);
+        List<Long> userIds = new ArrayList<>();
+        userIds.add(userId);
+        userProject.setUserId(userIds);
+        tall3FeignClient.saveUserProject(userProject);
         return clickShareInfo;
     }