fix：子女段列表权限问题

server-service/src/main/java/com/makeit/dto/platform/elder/children/PlatElderChildrenInfoQueryDTO.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 长者子女账号
  * 长者子女账号
@@ -30,6 +32,8 @@ public class PlatElderChildrenInfoQueryDTO extends BaseTenantDTO {
 
 
     @ApiModelProperty(value = "组织id")
     @ApiModelProperty(value = "组织id")
     private String orgId;
     private String orgId;
+    @ApiModelProperty(value = "组织id集合")
+    private List<String> orgIdList;
 
 
 
 
 }
 }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CodeMessageEnum;
+import com.makeit.enums.Const;
 import com.makeit.exception.BusinessException;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper;
 import com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatOrgService;
@@ -66,6 +67,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
                 .like(StringUtils.isNotBlank(dto.getPhone()), PlatElderChildrenInfo::getPhone, dto.getPhone())
                 .like(StringUtils.isNotBlank(dto.getPhone()), PlatElderChildrenInfo::getPhone, dto.getPhone())
                 .eq(StringUtils.isNotBlank(dto.getElderId()), PlatElderChildrenInfo::getElderId, dto.getElderId())
                 .eq(StringUtils.isNotBlank(dto.getElderId()), PlatElderChildrenInfo::getElderId, dto.getElderId())
                 .eq(StringUtils.isNotBlank(dto.getTenantId()), PlatElderChildrenInfo::getTenantId, dto.getTenantId())
                 .eq(StringUtils.isNotBlank(dto.getTenantId()), PlatElderChildrenInfo::getTenantId, dto.getTenantId())
+                .in(CollectionUtils.isNotEmpty(dto.getOrgIdList()), PlatElderChildrenInfo::getOrgId, dto.getOrgIdList())
                 .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)");
                 .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)");
     }
     }
 
 
@@ -92,6 +94,11 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
         String tenantId = RequestUtil.getTenantIdHeader();
         String tenantId = RequestUtil.getTenantIdHeader();
         dto.setTenantId(tenantId);
         dto.setTenantId(tenantId);
 
 
+        String dataScope = RequestUtil.getDataScope();
+        if (StringUtils.isNotBlank(dataScope)) {
+            dto.setOrgIdList(Lists.newArrayList(dataScope.split(Const.COMMON_SPLIT)));
+        }
+
         LambdaQueryWrapper<PlatElderChildrenInfo> queryWrapper = lambdaQueryWrapper(dto);
         LambdaQueryWrapper<PlatElderChildrenInfo> queryWrapper = lambdaQueryWrapper(dto);
         queryWrapper.groupBy(PlatElderChildrenInfo::getOpenid);
         queryWrapper.groupBy(PlatElderChildrenInfo::getOpenid);
         Page<PlatElderChildrenInfo> voPage = page(p, queryWrapper);
         Page<PlatElderChildrenInfo> voPage = page(p, queryWrapper);