独联体-个人中心菜单分区

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/personalcenter/PersonalCenter.java

@@ -17,6 +17,10 @@ public class PersonalCenter {
     @TableId(value = "center_id", type = IdType.AUTO)
     private Integer centerId;
 
+    @ApiModelProperty("分区")
+    @TableField("partition_id")
+    private Integer partitionId;
+
     /**
      * 个人中心功能编码
      */

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java

@@ -14,6 +14,7 @@ import com.accompany.business.vo.personalcenter.PersonalCenterVo;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.device.DeviceInfo;
 import com.accompany.common.utils.AppVersionUtil;
+import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.model.Users;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +25,6 @@ import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -59,8 +59,12 @@ public class PersonalCenterService {
         Users user = usersService.getUsersByUid(uid);
         if(user == null || !checkUserInExpect(uid)){
             wrapper.lambda().ne(PersonalCenter :: getShowPermission, Constant.ShowPermission.CLAN_OR_HALL);
+            wrapper.lambda().eq(PersonalCenter :: getPartitionId, PartitionEnum.ARAB.getId());
         }
-        if(! checkUserClanStatus(uid)){
+        if (user != null) {
+            wrapper.lambda().eq(PersonalCenter :: getPartitionId, user.getPartitionId());
+        }
+        if(!checkUserClanStatus(uid)){
             wrapper.lambda().ne(PersonalCenter :: getShowPermission, Constant.ShowPermission.CLAN_ASSOCIATE);
         }
         List<PersonalCenter> dbList = personalCenterMapper.selectList(wrapper);