sync: hosted cloud

backend-server/application/src/main/java/com/apitable/internal/controller/InternalNodePermissionController.java

@@ -68,7 +68,7 @@ public class InternalNodePermissionController {
         @Parameter(name = "shareId", description = "Share ID", schema = @Schema(type = "string"),
             in = ParameterIn.QUERY, example = "shrFPXT8qnyFJglX6elJi")
     })
-    @ThirdPartControl()
+    @ThirdPartControl
     public ResponseData<DatasheetPermissionView> getNodePermission(
         @PathVariable("nodeId") String nodeId,
         @RequestParam(value = "shareId", required = false) String shareId) {

backend-server/application/src/main/java/com/apitable/organization/controller/TeamController.java

@@ -32,7 +32,6 @@
 import com.apitable.interfaces.social.facade.SocialServiceFacade;
 import com.apitable.organization.entity.TeamEntity;
 import com.apitable.organization.mapper.TeamMapper;
-import com.apitable.organization.mapper.TeamMemberRelMapper;
 import com.apitable.organization.ro.CreateTeamRo;
 import com.apitable.organization.ro.UpdateTeamRo;
 import com.apitable.organization.service.ITeamService;
@@ -77,9 +76,6 @@ public class TeamController {
     @Resource
     private TeamMapper teamMapper;
 
-    @Resource
-    private TeamMemberRelMapper teamMemberRelMapper;
-
     @Resource
     private SocialServiceFacade socialServiceFacade;
 

backend-server/application/src/main/java/com/apitable/organization/mapper/MemberMapper.java

@@ -18,28 +18,28 @@
 
 package com.apitable.organization.mapper;
 
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
+import com.apitable.organization.dto.MemberBaseInfoDTO;
 import com.apitable.organization.dto.MemberDTO;
+import com.apitable.organization.dto.MemberTeamInfoDTO;
 import com.apitable.organization.dto.SearchMemberDTO;
 import com.apitable.organization.dto.SpaceMemberDTO;
 import com.apitable.organization.dto.SpaceMemberIdDTO;
-import com.apitable.player.dto.PlayerBaseDTO;
-import com.apitable.workspace.vo.FieldRoleMemberVo;
-import com.apitable.workspace.vo.NodeRoleMemberVo;
+import com.apitable.organization.dto.TenantMemberDto;
+import com.apitable.organization.entity.MemberEntity;
 import com.apitable.organization.vo.MemberInfoVo;
 import com.apitable.organization.vo.SearchMemberVo;
 import com.apitable.organization.vo.UnitMemberVo;
-import com.apitable.space.vo.MainAdminInfoVo;
-import com.apitable.organization.dto.MemberBaseInfoDTO;
-import com.apitable.organization.dto.MemberTeamInfoDTO;
+import com.apitable.player.dto.PlayerBaseDTO;
 import com.apitable.shared.util.ibatis.ExpandBaseMapper;
-import com.apitable.organization.dto.TenantMemberDto;
+import com.apitable.space.vo.MainAdminInfoVo;
 import com.apitable.workspace.dto.MemberInfoDTO;
-import com.apitable.organization.entity.MemberEntity;
+import com.apitable.workspace.vo.FieldRoleMemberVo;
+import com.apitable.workspace.vo.NodeRoleMemberVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.Collection;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface MemberMapper extends ExpandBaseMapper<MemberEntity> {
 
@@ -615,11 +615,22 @@ public interface MemberMapper extends ExpandBaseMapper<MemberEntity> {
      */
     List<NodeRoleMemberVo> selectNodeRoleMemberByIds(@Param("memberIds") Collection<Long> memberIds);
 
+    /**
+     * Query Incomplete Member View.
+     *
+     * @param page      page param
+     * @param spaceId   space id
+     * @return IPage<NodeRoleMemberVo>
+     * @author Chambers
+     */
+    IPage<NodeRoleMemberVo> selectIncompleteMemberVo(Page<NodeRoleMemberVo> page,
+        @Param("spaceId") String spaceId);
+
     /**
      * query the members' FieldRole
      *
      * @param memberIds member id
-     * @return NodeRoleMemberVo
+     * @return List<FieldRoleMemberVo>
      */
     List<FieldRoleMemberVo> selectFieldRoleMemberByIds(@Param("memberIds") Collection<Long> memberIds);
 

backend-server/application/src/main/java/com/apitable/shared/aspect/ChainOnNotificationAspect.java

@@ -18,36 +18,33 @@
 
 package com.apitable.shared.aspect;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-
 import com.apitable.shared.component.TaskManager;
 import com.apitable.shared.component.notification.NotificationHelper;
 import com.apitable.shared.component.notification.NotificationManager;
 import com.apitable.shared.component.notification.NotificationRenderField;
 import com.apitable.shared.component.notification.NotificationTemplateId;
+import com.apitable.shared.component.notification.RequestStorage;
 import com.apitable.shared.component.notification.annotation.Notification;
 import com.apitable.shared.context.LoginContext;
 import com.apitable.shared.context.SessionContext;
 import com.apitable.shared.holder.NotificationRenderFieldHolder;
-
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.util.ContentCachingRequestWrapper;
 
 /**
  * <p>
- * notification aop
+ * notification aop.
  * </p>
  *
  * @author zoe zheng
@@ -60,39 +57,53 @@ public class ChainOnNotificationAspect extends BaseAspectSupport {
     @Resource
     private NotificationManager notificationManager;
 
+    /**
+     * pointcut.
+     *
+     * @param notification notification annotation
+     * @param result       response data
+     */
     @AfterReturning(pointcut = "@annotation(notification)", returning = "result")
     public void doAfterReturning(Notification notification, Object result) {
         try {
             NotificationRenderField renderField = NotificationRenderFieldHolder.get();
 
-            HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder
+                .currentRequestAttributes())
+                .getRequest();
+            ContentCachingRequestWrapper requestWrapper = (ContentCachingRequestWrapper) request;
+            RequestStorage requestStorage = RequestStorage.create(requestWrapper);
             boolean isNodeOperate = NotificationHelper.isNodeOperate(request.getServletPath());
             final String spaceId;
             final Long fromUserId;
             final List<Long> playerIds;
             final Map<String, Object> bodyExtras;
             if (renderField != null) {
-                spaceId = StrUtil.isNotBlank(renderField.getSpaceId()) ? renderField.getSpaceId() : LoginContext.me().getSpaceId();
-                fromUserId = ObjectUtil.isNotNull(renderField.getFromUserId()) ? renderField.getFromUserId() : SessionContext.getUserId();
+                spaceId = StrUtil.isNotBlank(renderField.getSpaceId()) ? renderField.getSpaceId() :
+                    LoginContext.me().getSpaceId();
+                fromUserId = ObjectUtil.isNotNull(renderField.getFromUserId())
+                    ? renderField.getFromUserId() : SessionContext.getUserId();
                 playerIds = renderField.getPlayerIds();
                 bodyExtras = renderField.getBodyExtras();
-            }
-            else {
+            } else {
                 spaceId = LoginContext.me().getSpaceId();
                 fromUserId = SessionContext.getUserId();
                 playerIds = null;
                 bodyExtras = null;
             }
             for (NotificationTemplateId templateId : notification.templateId()) {
                 if (isNodeOperate) {
-                    TaskManager.me().execute(() -> notificationManager.spaceNotify(templateId, fromUserId, spaceId, result));
-                }
-                else {
-                    TaskManager.me().execute(() -> notificationManager.playerNotify(templateId, playerIds, fromUserId, spaceId, bodyExtras));
+                    TaskManager.me().execute(
+                        () -> notificationManager.spaceNotify(requestStorage, templateId,
+                            fromUserId, spaceId,
+                            result));
+                } else {
+                    TaskManager.me().execute(
+                        () -> notificationManager.playerNotify(templateId, playerIds, fromUserId,
+                            spaceId, bodyExtras));
                 }
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             log.error("PlayerNotification:Error", e);
         }
     }