feat(matchmaker): ZC-MM-002 A1 服务对象分配建模（DEC-MATCHMAKER-002 LOCKED 落地）
数据库（V053/V054）：
- 新表 matchmaker_assignments：独立分配关系（assigned_by/reason/scope/
expires_at/ended_at/end_reason），状态机 active/ended/revoked/transferred/
expired（CHECK 白名单），部分唯一索引防同用户多 ACTIVE 主责分配，
存量进行中服务单幂等回填
- 新角色 matchmaker_leader(014) + 新权限 matchmaker.team.assign(10000000-…-023)；
组长授 view/service/team.assign（不给平台级 matchmaker.assign）
后端：
- ServiceAssignmentPolicy 有效分配判定器（读前惰性过期，失效分配即时拒绝）
- 分配/转分配/撤销/结束四操作：状态机非法转换拒绝、理由必填、
同用户主责冲突拒绝；组织范围校验（team.assign 同组织，NULL=NULL 视为
平台直属，技术默认安全值待治理登记）；transfer 同时校验原持有人与新目标范围
- 全操作审计 MATCHMAKER_ASSIGNMENT_CREATE/TRANSFER/REVOKE/END，
operatorId=当前操作者，afterData 仅记摘要（无敏感内容）
- 删除认领端点 POST /services/{id}/claim（A1 禁止普通红娘认领，MM-AUTH-004=404）
- GET /pending 收敛为分配权持有者（assign or team.assign）；
dashboard today/completed 改本人口径，inProgress 口径修正 'processing'→'in_service'
- recommend/followup/complete/detail 归属判定接入判定器，拒绝走
DataScopeGuard（自动 DATA_SCOPE_DENIED 审计），不再裸 IllegalStateException；
assignService 与创建分配同事务联动；删除死查询 findAssignedTo
前端：
- admin-web 分配弹窗去硬编码假数据（operator_wang/chen）→ assignable-matchmakers
真实接口（仅 id/name/organizationId，无联系方式）+ 理由必填；
队列 tab 按 assign/team.assign 显隐；新增「服务对象分配」tab（转分配/撤销/结束）
- 小程序红娘工作台：删除接单入口，数据源切 GET /operator/matchmaker/assignments/my，
枚举码不上屏（中文映射），空 serviceId 不跳转
测试：
- MatchmakerAssignmentA1Test 14 用例（MM-AUTH-001~004、MM-AUDIT-001、
MM-LIFECYCLE-001、组长跨组织拒绝、NULL=NULL 平台直属边界、transfer 原持有人
范围负向、/pending 403+审计），负向注入自证有效
- MatchmakerAssignmentPermissionTest 3 用例（端点权限契约 + claim 残留扫描）
- MatchmakerServiceTest 补 assignment 状态/scope 白名单守卫；迁移基线 LATEST=54
- 验证：定向 38/38 全绿；UI 契约 24/24；小程序 wcc/wcsc 真编译 0 失败
This commit is contained in:
WorkBuddy
+136
@@ -0,0 +1,136 @@
|
||||
package com.danyang.match.platform.matchmaker.controller;
|
||||
|
||||
import com.danyang.match.platform.matchmaker.entity.MatchmakerAssignment;
|
||||
import com.danyang.match.platform.matchmaker.service.MatchmakerAssignmentService;
|
||||
import com.danyang.match.platform.shared.dto.ApiResponse;
|
||||
import com.danyang.match.platform.shared.security.principal.OperatorPrincipal;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 服务对象分配接口（运营端，ZC-MM-002 / A1）。
|
||||
*
|
||||
* <p>权限模型（D2）：
|
||||
* <ul>
|
||||
* <li>写操作（创建/转分配/撤销/结束/可分配列表）：
|
||||
* {@code matchmaker.assign}（平台授权人员，不限组织）
|
||||
* 或 {@code matchmaker.team.assign}（红娘组长，同组织范围）；</li>
|
||||
* <li>读自己名下分配（/my）：{@code matchmaker.service}（普通红娘即可）。</li>
|
||||
* </ul>
|
||||
* operatorId 一律取当前认证主体（principal），不信任请求参数。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/operator/matchmaker/assignments")
|
||||
@RequiredArgsConstructor
|
||||
public class MatchmakerAssignmentController {
|
||||
|
||||
private final MatchmakerAssignmentService assignmentService;
|
||||
|
||||
/**
|
||||
* 创建分配。
|
||||
* Body: userId / matchmakerOperatorId / serviceId? / reason（必填）/ expiresAt?（ISO-8601）
|
||||
*/
|
||||
@PostMapping
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<?> create(@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@RequestBody Map<String, String> body) {
|
||||
MatchmakerAssignment created = assignmentService.create(
|
||||
principal.id(),
|
||||
principal.hasPermission("matchmaker.assign"),
|
||||
body.get("userId"),
|
||||
body.get("matchmakerOperatorId"),
|
||||
body.getOrDefault("serviceId", null),
|
||||
body.get("reason"),
|
||||
parseInstant(body.get("expiresAt")));
|
||||
return ApiResponse.ok(assignmentView(created));
|
||||
}
|
||||
|
||||
/** 转分配：旧记录置 transferred，同事务新建 active。reason 必填。 */
|
||||
@PostMapping("/{id}/transfer")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<?> transfer(@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id,
|
||||
@RequestBody Map<String, String> body) {
|
||||
MatchmakerAssignment created = assignmentService.transfer(
|
||||
id,
|
||||
principal.id(),
|
||||
principal.hasPermission("matchmaker.assign"),
|
||||
body.get("newMatchmakerOperatorId"),
|
||||
body.get("reason"));
|
||||
return ApiResponse.ok(assignmentView(created));
|
||||
}
|
||||
|
||||
/** 撤销分配。reason 必填。 */
|
||||
@PostMapping("/{id}/revoke")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<?> revoke(@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id,
|
||||
@RequestBody Map<String, String> body) {
|
||||
return ApiResponse.ok(assignmentView(assignmentService.revoke(
|
||||
id, principal.id(), principal.hasPermission("matchmaker.assign"),
|
||||
body.get("reason"))));
|
||||
}
|
||||
|
||||
/** 结束分配。reason 必填。 */
|
||||
@PostMapping("/{id}/end")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<?> end(@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id,
|
||||
@RequestBody Map<String, String> body) {
|
||||
return ApiResponse.ok(assignmentView(assignmentService.end(
|
||||
id, principal.id(), principal.hasPermission("matchmaker.assign"),
|
||||
body.get("reason"))));
|
||||
}
|
||||
|
||||
/** 我名下生效中的服务对象分配（普通红娘工作台）。 */
|
||||
@GetMapping("/my")
|
||||
@PreAuthorize("hasAuthority('matchmaker.service')")
|
||||
public ApiResponse<List<Map<String, Object>>> my(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal) {
|
||||
List<Map<String, Object>> list = assignmentService.listMy(principal.id()).stream()
|
||||
.map(this::assignmentView)
|
||||
.toList();
|
||||
return ApiResponse.ok(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可分配红娘列表（创建/转分配弹窗数据源）。
|
||||
* 返回 id/name/organizationId，不含联系方式（字段级隐私，ZC-MM-005 范围）。
|
||||
*/
|
||||
@GetMapping("/assignable-matchmakers")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<List<Map<String, Object>>> assignable(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal) {
|
||||
return ApiResponse.ok(assignmentService.listAssignableMatchmakers(
|
||||
principal.id(), principal.hasPermission("matchmaker.assign")));
|
||||
}
|
||||
|
||||
private Instant parseInstant(String raw) {
|
||||
if (raw == null || raw.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
return Instant.parse(raw);
|
||||
}
|
||||
|
||||
private Map<String, Object> assignmentView(MatchmakerAssignment a) {
|
||||
return Map.ofEntries(
|
||||
Map.entry("id", a.getId()),
|
||||
Map.entry("userId", a.getUserId()),
|
||||
Map.entry("matchmakerOperatorId", a.getMatchmakerOperatorId()),
|
||||
Map.entry("serviceId", a.getServiceId() == null ? "" : a.getServiceId()),
|
||||
Map.entry("assignmentScope", a.getAssignmentScope()),
|
||||
Map.entry("status", a.getStatus()),
|
||||
Map.entry("assignmentReason", a.getAssignmentReason()),
|
||||
Map.entry("assignedAt", a.getAssignedAt() == null ? "" : a.getAssignedAt().toString()),
|
||||
Map.entry("expiresAt", a.getExpiresAt() == null ? "" : a.getExpiresAt().toString()),
|
||||
Map.entry("endedAt", a.getEndedAt() == null ? "" : a.getEndedAt().toString()),
|
||||
Map.entry("endReason", a.getEndReason() == null ? "" : a.getEndReason())
|
||||
);
|
||||
}
|
||||
}
|
||||
+22
-13
@@ -13,6 +13,11 @@ import java.util.Map;
|
||||
|
||||
/**
|
||||
* 红娘工作台控制器（Operator调用）
|
||||
*
|
||||
* <p>ZC-MM-002（A1）状态机变更：原 {@code POST /services/{id}/claim}（红娘接单）端点已删除。
|
||||
* 服务对象归属统一由 matchmaker_assignments 建模（D3 决策：不保留组长认领），
|
||||
* 分配入口收敛为 {@code MatchmakerAssignmentController}（POST /operator/matchmaker/assignments），
|
||||
* 服务单状态由分配动作同事务联动（submitted → assigned）。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/operator/matchmaker")
|
||||
@@ -29,30 +34,33 @@ public class MatchmakerOperatorController {
|
||||
return ApiResponse.ok(matchmakerServiceService.getDashboard(operatorId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 待分配队列。ZC-MM-002（D4）：方法级权限收敛 —— 仅分配权持有者
|
||||
* （matchmaker.assign 平台授权 / matchmaker.team.assign 组长）可看全局待分配队列，
|
||||
* 普通红娘（仅 matchmaker.view/service）403。
|
||||
*/
|
||||
@GetMapping("/pending")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign') or hasAuthority('matchmaker.team.assign')")
|
||||
public ApiResponse<List<Map<String, Object>>> getPending(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal) {
|
||||
return ApiResponse.ok(matchmakerServiceService.getPendingServices());
|
||||
}
|
||||
|
||||
/**
|
||||
* 分配服务给红娘（兼容入口）。ZC-MM-002（D4）：
|
||||
* 同事务联动「创建 matchmaker_assignments 分配 + 服务单置 assigned」。
|
||||
*/
|
||||
@PostMapping("/services/{id}/assign")
|
||||
@PreAuthorize("hasAuthority('matchmaker.assign')")
|
||||
public ApiResponse<?> assignService(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id,
|
||||
@RequestBody Map<String, String> body) {
|
||||
String operatorId = principal.id();
|
||||
String assignOperatorId = body.get("operatorId");
|
||||
return ApiResponse.ok(matchmakerServiceService.assignService(id, assignOperatorId, null));
|
||||
}
|
||||
|
||||
@PostMapping("/services/{id}/claim")
|
||||
@PreAuthorize("hasAuthority('matchmaker.service')")
|
||||
public ApiResponse<?> claimService(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id) {
|
||||
String operatorId = principal.id();
|
||||
return ApiResponse.ok(matchmakerServiceService.claimService(operatorId, id));
|
||||
String assignerOperatorId = principal.id();
|
||||
String targetOperatorId = body.get("operatorId");
|
||||
String reason = body.getOrDefault("reason", "红娘服务单分配");
|
||||
return ApiResponse.ok(matchmakerServiceService.assignService(
|
||||
id, assignerOperatorId, targetOperatorId, reason));
|
||||
}
|
||||
|
||||
@GetMapping("/my-services")
|
||||
@@ -114,7 +122,8 @@ public class MatchmakerOperatorController {
|
||||
public ApiResponse<?> completeService(
|
||||
@AuthenticationPrincipal OperatorPrincipal principal,
|
||||
@PathVariable String id) {
|
||||
return ApiResponse.ok(matchmakerServiceService.completeService(id));
|
||||
// ZC-MM-002（D4）：归属判定切换到 ServiceAssignmentPolicy（服务层完成）
|
||||
return ApiResponse.ok(matchmakerServiceService.completeService(id, principal.id()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package com.danyang.match.platform.matchmaker.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.danyang.match.platform.shared.base.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.time.Instant;
|
||||
|
||||
/**
|
||||
* 服务对象分配（ZC-MM-002 / A1）
|
||||
* 对应 DB: matchmaker_assignments（V053）
|
||||
*
|
||||
* <p>建模说明：
|
||||
* <ul>
|
||||
* <li>{@code matchmakerOperatorId}：持有该用户服务对象的红娘（operators 主体，
|
||||
* 沿用 matchmaker_services.assigned_operator_id 惯例）。</li>
|
||||
* <li>{@code assignedBy}：做出本次分配的操作者（组长 / 平台授权人员）。</li>
|
||||
* <li>状态机（D5）：active → transferred / revoked / ended；
|
||||
* expires_at 届满由 {@code ServiceAssignmentPolicy} 惰性置 expired（无定时任务）；
|
||||
* 终态一律拒绝再转换。</li>
|
||||
* <li>scope：primary（主责，同用户仅一条生效中，DB 部分唯一索引兜底）/
|
||||
* collaborating（协同）。</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("matchmaker_assignments")
|
||||
public class MatchmakerAssignment extends BaseEntity {
|
||||
|
||||
/** 被服务用户 */
|
||||
private String userId;
|
||||
|
||||
/** 持有服务对象的红娘（operators.id） */
|
||||
private String matchmakerOperatorId;
|
||||
|
||||
/** 关联的服务单（可空：允许脱离服务单的用户级分配） */
|
||||
private String serviceId;
|
||||
|
||||
/** 做出本次分配的操作者（operators.id） */
|
||||
private String assignedBy;
|
||||
|
||||
/** 分配范围：primary / collaborating（与 V053 chk_mm_assignment_scope 白名单一致） */
|
||||
private String assignmentScope;
|
||||
|
||||
/** 分配理由（必填） */
|
||||
private String assignmentReason;
|
||||
|
||||
/** 状态：active/ended/revoked/transferred/expired（与 V053 chk_mm_assignment_status 白名单一致） */
|
||||
private String status;
|
||||
|
||||
private Instant assignedAt;
|
||||
|
||||
/** 有效期届满时间；null 表示长期有效 */
|
||||
private Instant expiresAt;
|
||||
|
||||
/** 终态时间（ended/revoked/transferred/expired 时落库） */
|
||||
private Instant endedAt;
|
||||
|
||||
/** 终态理由（revoked/ended 必填；transferred 记录转分配理由；expired 为固定文案） */
|
||||
private String endReason;
|
||||
}
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
package com.danyang.match.platform.matchmaker.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.danyang.match.platform.matchmaker.entity.MatchmakerAssignment;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* 服务对象分配 Mapper（ZC-MM-002 / A1）
|
||||
*
|
||||
* <p>「生效中」的统一口径：status = 'active' 且（expires_at IS NULL OR expires_at > NOW()）。
|
||||
* 惰性过期由 {@link #expireOverdue} 负责（读前触发，无定时任务），
|
||||
* 这里的 expires 条件是双保险：即使惰性过期尚未执行，已届满的行也不会被当作生效中。
|
||||
*/
|
||||
@Mapper
|
||||
public interface MatchmakerAssignmentMapper extends BaseMapper<MatchmakerAssignment> {
|
||||
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE id = #{id} AND deleted_at IS NULL LIMIT 1")
|
||||
Optional<MatchmakerAssignment> findById(@Param("id") String id);
|
||||
|
||||
/** 某红娘名下全部生效中的分配（GET /my、GET /assignable 的工作台口径） */
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE matchmaker_operator_id = #{operatorId} " +
|
||||
"AND status = 'active' AND (expires_at IS NULL OR expires_at > NOW()) " +
|
||||
"AND deleted_at IS NULL ORDER BY assigned_at DESC")
|
||||
List<MatchmakerAssignment> findActiveByOperator(@Param("operatorId") String operatorId);
|
||||
|
||||
/** 某红娘对某用户是否持有生效中的分配（数据范围判定核心查询） */
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE matchmaker_operator_id = #{operatorId} " +
|
||||
"AND user_id = #{userId} AND status = 'active' " +
|
||||
"AND (expires_at IS NULL OR expires_at > NOW()) " +
|
||||
"AND deleted_at IS NULL ORDER BY assigned_at DESC LIMIT 1")
|
||||
Optional<MatchmakerAssignment> findActiveByOperatorAndUser(@Param("operatorId") String operatorId,
|
||||
@Param("userId") String userId);
|
||||
|
||||
/** 某用户当前生效中的主责分配（创建/转分配前的唯一性预检） */
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE user_id = #{userId} " +
|
||||
"AND status = 'active' AND assignment_scope = 'primary' " +
|
||||
"AND (expires_at IS NULL OR expires_at > NOW()) " +
|
||||
"AND deleted_at IS NULL LIMIT 1")
|
||||
Optional<MatchmakerAssignment> findActivePrimaryByUser(@Param("userId") String userId);
|
||||
|
||||
/** 某服务单上生效中的分配（服务单维度的归属判定） */
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE service_id = #{serviceId} " +
|
||||
"AND status = 'active' AND (expires_at IS NULL OR expires_at > NOW()) " +
|
||||
"AND deleted_at IS NULL ORDER BY assigned_at DESC LIMIT 1")
|
||||
Optional<MatchmakerAssignment> findActiveByService(@Param("serviceId") String serviceId);
|
||||
|
||||
/** 某服务单的全部分配历史（追溯用） */
|
||||
@Select("SELECT * FROM matchmaker_assignments WHERE service_id = #{serviceId} " +
|
||||
"AND deleted_at IS NULL ORDER BY assigned_at DESC")
|
||||
List<MatchmakerAssignment> findByService(@Param("serviceId") String serviceId);
|
||||
|
||||
/**
|
||||
* 惰性过期：把 expires_at 已届满的 active 行置为 expired 并落库。
|
||||
* 由 {@code ServiceAssignmentPolicy} 在读取路径前触发，无定时任务。
|
||||
*
|
||||
* @return 本次被置为 expired 的行数
|
||||
*/
|
||||
@Update("UPDATE matchmaker_assignments SET status = 'expired', " +
|
||||
"ended_at = NOW(), end_reason = '有效期届满自动失效', updated_at = NOW() " +
|
||||
"WHERE status = 'active' AND expires_at IS NOT NULL AND expires_at < NOW() " +
|
||||
"AND deleted_at IS NULL")
|
||||
int expireOverdue();
|
||||
}
|
||||
+16
-5
@@ -26,11 +26,25 @@ public interface MatchmakerServiceMapper extends BaseMapper<MatchmakerServiceRec
|
||||
@Select("SELECT COUNT(*) FROM matchmaker_services WHERE status = 'submitted' AND deleted_at IS NULL")
|
||||
long countSubmitted();
|
||||
|
||||
/** 某红娘进行中的服务数（工作台统计） */
|
||||
/**
|
||||
* 某红娘进行中的服务数（工作台统计）。
|
||||
* ZC-MM-002（D4）：状态口径修正 'processing' → 'in_service'
|
||||
* （'processing' 不在 V009 chk_matchmaker_status 白名单，原查询恒为 0）。
|
||||
*/
|
||||
@Select("SELECT COUNT(*) FROM matchmaker_services WHERE assigned_operator_id = #{operatorId} " +
|
||||
"AND status = 'processing' AND deleted_at IS NULL")
|
||||
"AND status = 'in_service' AND deleted_at IS NULL")
|
||||
long countInProgressByOperator(@Param("operatorId") String operatorId);
|
||||
|
||||
/** 某红娘今天名下新流转的服务数（工作台「今日」本人口径，ZC-MM-002 / D4） */
|
||||
@Select("SELECT COUNT(*) FROM matchmaker_services WHERE assigned_operator_id = #{operatorId} " +
|
||||
"AND CAST(assigned_at AS DATE) = CURRENT_DATE AND deleted_at IS NULL")
|
||||
long countTodayByOperator(@Param("operatorId") String operatorId);
|
||||
|
||||
/** 某红娘名下已完成的服务数（工作台「已完成」本人口径，ZC-MM-002 / D4） */
|
||||
@Select("SELECT COUNT(*) FROM matchmaker_services WHERE assigned_operator_id = #{operatorId} " +
|
||||
"AND status = 'completed' AND deleted_at IS NULL")
|
||||
long countCompletedByOperator(@Param("operatorId") String operatorId);
|
||||
|
||||
@Select("SELECT * FROM matchmaker_services WHERE user_id = #{userId} ORDER BY created_at DESC LIMIT #{limit}")
|
||||
List<MatchmakerServiceRecord> findByUser(@Param("userId") String userId, @Param("limit") int limit);
|
||||
|
||||
@@ -39,9 +53,6 @@ public interface MatchmakerServiceMapper extends BaseMapper<MatchmakerServiceRec
|
||||
"AND deleted_at IS NULL ORDER BY created_at DESC")
|
||||
List<MatchmakerServiceRecord> findByOperatorId(@Param("operatorId") String operatorId);
|
||||
|
||||
@Select("SELECT * FROM matchmaker_services WHERE assigned_operator_id = #{operatorId} AND status IN ('submitted','assigned','processing') ORDER BY created_at DESC")
|
||||
List<MatchmakerServiceRecord> findAssignedTo(@Param("operatorId") String operatorId);
|
||||
|
||||
/**
|
||||
* Phase 13：查该红娘名下、且服务对象为该用户的进行中服务（转介授权校验用）。
|
||||
* 转介必须挂在真实存在的服务关系上，否则等于任意红娘可代任意用户操作。
|
||||
|
||||
+339
@@ -0,0 +1,339 @@
|
||||
package com.danyang.match.platform.matchmaker.service;
|
||||
|
||||
import com.danyang.match.platform.audit.entity.AuditLog;
|
||||
import com.danyang.match.platform.audit.mapper.AuditLogMapper;
|
||||
import com.danyang.match.platform.matchmaker.entity.MatchmakerAssignment;
|
||||
import com.danyang.match.platform.matchmaker.entity.MatchmakerServiceRecord;
|
||||
import com.danyang.match.platform.matchmaker.mapper.MatchmakerAssignmentMapper;
|
||||
import com.danyang.match.platform.matchmaker.mapper.MatchmakerServiceMapper;
|
||||
import com.danyang.match.platform.permission.entity.Operator;
|
||||
import com.danyang.match.platform.permission.mapper.OperatorMapper;
|
||||
import com.danyang.match.platform.shared.constant.Constants;
|
||||
import com.danyang.match.platform.shared.enums.ApiResponseCode;
|
||||
import com.danyang.match.platform.shared.exception.GlobalExceptionHandler.BusinessException;
|
||||
import com.danyang.match.platform.shared.security.DataScopeGuard;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.dao.DuplicateKeyException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 服务对象分配服务（ZC-MM-002 / A1，架构师设计 D5）。
|
||||
*
|
||||
* <p>状态机矩阵（status ∈ active/ended/revoked/transferred/expired）：
|
||||
* <pre>
|
||||
* active → transferred（transfer：旧记录置 transferred + end_reason，同事务新建 active）
|
||||
* active → revoked （撤销，end_reason 必填）
|
||||
* active → ended （结束，end_reason 必填）
|
||||
* 终态（ended/revoked/transferred/expired）一律拒绝再转换 → CONFLICT
|
||||
* </pre>
|
||||
*
|
||||
* <p>权限模型（D2）：
|
||||
* <ul>
|
||||
* <li>{@code matchmaker.assign}：平台授权人员，不限组织；</li>
|
||||
* <li>{@code matchmaker.team.assign}：红娘组长，团队边界 = 同 organization_id。</li>
|
||||
* </ul>
|
||||
* 组织边界规则（技术默认，治理登记后续补充）：
|
||||
* <b>NULL=NULL 视为平台直属</b> —— 平台直属组长只能分配平台直属红娘；
|
||||
* 有组织组长不能分配 org=NULL 红娘；org=NULL 普通红娘只能由 matchmaker.assign 持有者分配。
|
||||
* 范围违规统一走 {@link DataScopeGuard#deny}（自动落 DATA_SCOPE_DENIED 审计，403）。
|
||||
*
|
||||
* <p>唯一性：同 user_id + primary scope 同时最多一条 active（DB 部分唯一索引兜底），
|
||||
* 业务层预检 + 捕获 DuplicateKeyException 双保险，均映射 CONFLICT。
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MatchmakerAssignmentService {
|
||||
|
||||
private static final String RESOURCE_TYPE = "matchmaker_assignment";
|
||||
|
||||
private final MatchmakerAssignmentMapper assignmentMapper;
|
||||
private final MatchmakerServiceMapper serviceMapper;
|
||||
private final OperatorMapper operatorMapper;
|
||||
private final DataScopeGuard dataScopeGuard;
|
||||
private final AuditLogMapper auditLogMapper;
|
||||
/** 读路径复用判定器（含惰性过期）；Policy 不反向依赖本 Service，无环。 */
|
||||
private final ServiceAssignmentPolicy serviceAssignmentPolicy;
|
||||
|
||||
/**
|
||||
* 创建分配（primary）。含可选服务单联动：serviceId 非空时同事务把服务单置为 assigned。
|
||||
*
|
||||
* @param assignerOperatorId 当前操作者（分配人）
|
||||
* @param hasGlobalAssign 操作者是否持有 matchmaker.assign（true=不限组织）
|
||||
* @param userId 被服务用户
|
||||
* @param matchmakerOperatorId 目标红娘
|
||||
* @param serviceId 关联服务单（可空）
|
||||
* @param reason 分配理由（必填）
|
||||
* @param expiresAt 有效期（可空=长期）
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerAssignment create(String assignerOperatorId, boolean hasGlobalAssign,
|
||||
String userId, String matchmakerOperatorId,
|
||||
String serviceId, String reason, Instant expiresAt) {
|
||||
requireReason(reason, "分配理由必填");
|
||||
|
||||
Operator target = requireActiveOperator(matchmakerOperatorId, "目标红娘不存在");
|
||||
assertAssignScope(assignerOperatorId, hasGlobalAssign, matchmakerOperatorId,
|
||||
"组长只能分配同组织的红娘（NULL=NULL 平台直属）", matchmakerOperatorId);
|
||||
|
||||
assignmentMapper.findActivePrimaryByUser(userId).ifPresent(existing -> {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT,
|
||||
"该用户已存在生效中的主责分配，请先转分配或撤销");
|
||||
});
|
||||
|
||||
if (serviceId != null && !serviceId.isBlank()) {
|
||||
linkServiceRow(serviceId, matchmakerOperatorId);
|
||||
}
|
||||
|
||||
MatchmakerAssignment assignment = new MatchmakerAssignment();
|
||||
assignment.setUserId(userId);
|
||||
assignment.setMatchmakerOperatorId(matchmakerOperatorId);
|
||||
assignment.setServiceId(serviceId);
|
||||
assignment.setAssignedBy(assignerOperatorId);
|
||||
assignment.setAssignmentScope(Constants.ASSIGNMENT_SCOPE_PRIMARY);
|
||||
assignment.setAssignmentReason(reason);
|
||||
assignment.setStatus(Constants.ASSIGNMENT_STATUS_ACTIVE);
|
||||
assignment.setAssignedAt(Instant.now());
|
||||
assignment.setExpiresAt(expiresAt);
|
||||
try {
|
||||
assignmentMapper.insert(assignment);
|
||||
} catch (DuplicateKeyException e) {
|
||||
// 并发竞态兜底：uq_mm_assignment_active_primary 部分唯一索引拒绝第二条 active+primary
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT,
|
||||
"该用户已存在生效中的主责分配（并发创建被唯一索引拒绝）");
|
||||
}
|
||||
|
||||
log.info("服务对象分配创建: assignmentId={}, userId={}, matchmakerOperatorId={}, by={}",
|
||||
assignment.getId(), userId, matchmakerOperatorId, assignerOperatorId);
|
||||
saveAudit(assignerOperatorId, Constants.AUDIT_ACTION_ASSIGNMENT_CREATE, assignment.getId(),
|
||||
auditSummary(matchmakerOperatorId, assignment.getAssignmentScope(), reason));
|
||||
return assignment;
|
||||
}
|
||||
|
||||
/**
|
||||
* 转分配（active → transferred + 同事务新建 active）。
|
||||
* 旧记录置 transferred + end_reason，新记录 assigned_by = 当前操作者。
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerAssignment transfer(String assignmentId, String assignerOperatorId,
|
||||
boolean hasGlobalAssign, String newMatchmakerOperatorId,
|
||||
String reason) {
|
||||
requireReason(reason, "转分配理由必填");
|
||||
|
||||
MatchmakerAssignment old = requireAssignment(assignmentId);
|
||||
assertActiveForTransition(old, "转分配");
|
||||
|
||||
// 防御纵深（QA P2-1）：不仅新目标红娘要在操作者范围内，
|
||||
// 被转记录的**原持有人**也必须在范围内（与 terminate 路径同口径；
|
||||
// 否则 org=X 组长可把 org=Y 红娘持有的分配"顺手"转走）。
|
||||
assertAssignScope(assignerOperatorId, hasGlobalAssign, old.getMatchmakerOperatorId(),
|
||||
"组长只能处置同组织红娘持有的分配（NULL=NULL 平台直属）", assignmentId);
|
||||
|
||||
requireActiveOperator(newMatchmakerOperatorId, "目标红娘不存在");
|
||||
assertAssignScope(assignerOperatorId, hasGlobalAssign, newMatchmakerOperatorId,
|
||||
"组长只能转分配给同组织的红娘（NULL=NULL 平台直属）", assignmentId);
|
||||
|
||||
// 1) 旧记录置 transferred
|
||||
old.setStatus(Constants.ASSIGNMENT_STATUS_TRANSFERRED);
|
||||
old.setEndReason(reason);
|
||||
old.setEndedAt(Instant.now());
|
||||
assignmentMapper.updateById(old);
|
||||
|
||||
// 2) 同事务新建 active 分配
|
||||
MatchmakerAssignment created = new MatchmakerAssignment();
|
||||
created.setUserId(old.getUserId());
|
||||
created.setMatchmakerOperatorId(newMatchmakerOperatorId);
|
||||
created.setServiceId(old.getServiceId());
|
||||
created.setAssignedBy(assignerOperatorId);
|
||||
created.setAssignmentScope(old.getAssignmentScope());
|
||||
created.setAssignmentReason(reason);
|
||||
created.setStatus(Constants.ASSIGNMENT_STATUS_ACTIVE);
|
||||
created.setAssignedAt(Instant.now());
|
||||
created.setExpiresAt(old.getExpiresAt());
|
||||
try {
|
||||
assignmentMapper.insert(created);
|
||||
} catch (DuplicateKeyException e) {
|
||||
// 事务内旧记录已非 active，正常不应触发；仍兜底映射 CONFLICT（整个事务回滚）
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT,
|
||||
"该用户已存在生效中的主责分配（并发转分配被唯一索引拒绝）");
|
||||
}
|
||||
|
||||
log.info("服务对象转分配: oldId={}, newId={}, fromUser={}, toOperator={}, by={}",
|
||||
old.getId(), created.getId(), old.getUserId(), newMatchmakerOperatorId, assignerOperatorId);
|
||||
saveAudit(assignerOperatorId, Constants.AUDIT_ACTION_ASSIGNMENT_TRANSFER, assignmentId,
|
||||
auditSummary(newMatchmakerOperatorId, created.getAssignmentScope(), reason));
|
||||
return created;
|
||||
}
|
||||
|
||||
/** 撤销分配（active → revoked，end_reason 必填）。 */
|
||||
@Transactional
|
||||
public MatchmakerAssignment revoke(String assignmentId, String operatorId,
|
||||
boolean hasGlobalAssign, String reason) {
|
||||
return terminate(assignmentId, operatorId, hasGlobalAssign, reason,
|
||||
Constants.ASSIGNMENT_STATUS_REVOKED, Constants.AUDIT_ACTION_ASSIGNMENT_REVOKE, "撤销");
|
||||
}
|
||||
|
||||
/** 结束分配（active → ended，end_reason 必填）。 */
|
||||
@Transactional
|
||||
public MatchmakerAssignment end(String assignmentId, String operatorId,
|
||||
boolean hasGlobalAssign, String reason) {
|
||||
return terminate(assignmentId, operatorId, hasGlobalAssign, reason,
|
||||
Constants.ASSIGNMENT_STATUS_ENDED, Constants.AUDIT_ACTION_ASSIGNMENT_END, "结束");
|
||||
}
|
||||
|
||||
/** 我（当前红娘）名下生效中的服务对象分配。读前惰性过期。 */
|
||||
public List<MatchmakerAssignment> listMy(String operatorId) {
|
||||
return serviceAssignmentPolicy.findActiveByOperator(operatorId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可分配红娘列表（创建分配弹窗数据源）。
|
||||
* operators.status='active'；组长按组织过滤、平台授权人员（matchmaker.assign）返回全部。
|
||||
* 返回 id/name/organizationId，<b>不含联系方式</b>（字段级隐私，ZC-MM-005 范围）。
|
||||
*/
|
||||
public List<Map<String, Object>> listAssignableMatchmakers(String assignerOperatorId,
|
||||
boolean hasGlobalAssign) {
|
||||
String assignerOrg = null;
|
||||
if (!hasGlobalAssign) {
|
||||
Operator assigner = operatorMapper.findById(assignerOperatorId)
|
||||
.orElseThrow(() -> new BusinessException(ApiResponseCode.NOT_FOUND, "操作者不存在"));
|
||||
assignerOrg = assigner.getOrganizationId();
|
||||
}
|
||||
String orgFilter = assignerOrg;
|
||||
return operatorMapper.selectList(
|
||||
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<Operator>()
|
||||
.eq(Operator::getStatus, "active")
|
||||
.isNull(Operator::getDeletedAt))
|
||||
.stream()
|
||||
.filter(op -> hasGlobalAssign || Objects.equals(orgFilter, op.getOrganizationId()))
|
||||
.map(op -> {
|
||||
Map<String, Object> item = new HashMap<>();
|
||||
item.put("id", op.getId());
|
||||
item.put("name", op.getName());
|
||||
item.put("organizationId", op.getOrganizationId());
|
||||
return item;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
// ==================== 内部实现 ====================
|
||||
|
||||
/** revoke / end 共用的终态迁移（仅允许 active → 终态）。 */
|
||||
private MatchmakerAssignment terminate(String assignmentId, String operatorId,
|
||||
boolean hasGlobalAssign, String reason,
|
||||
String targetStatus, String auditAction,
|
||||
String actionLabel) {
|
||||
requireReason(reason, actionLabel + "理由必填");
|
||||
|
||||
MatchmakerAssignment assignment = requireAssignment(assignmentId);
|
||||
assertActiveForTransition(assignment, actionLabel);
|
||||
|
||||
// 范围校验：操作者必须有权处置该红娘的分配（assign 不限组织 / team.assign 同组织）
|
||||
assertAssignScope(operatorId, hasGlobalAssign, assignment.getMatchmakerOperatorId(),
|
||||
"组长只能处置同组织红娘的分配（NULL=NULL 平台直属）", assignmentId);
|
||||
|
||||
assignment.setStatus(targetStatus);
|
||||
assignment.setEndReason(reason);
|
||||
assignment.setEndedAt(Instant.now());
|
||||
assignmentMapper.updateById(assignment);
|
||||
|
||||
log.info("服务对象分配{}: assignmentId={}, operatorId={}, by={}",
|
||||
actionLabel, assignmentId, assignment.getMatchmakerOperatorId(), operatorId);
|
||||
saveAudit(operatorId, auditAction, assignmentId,
|
||||
auditSummary(assignment.getMatchmakerOperatorId(), assignment.getAssignmentScope(), reason));
|
||||
return assignment;
|
||||
}
|
||||
|
||||
/**
|
||||
* 组织范围判定（D2）：hasGlobalAssign（matchmaker.assign）不限组织；
|
||||
* team.assign 时校验操作者与目标红娘 organization_id 一致。
|
||||
* <b>NULL=NULL 视为平台直属</b>：平台直属组长只能分配平台直属红娘；
|
||||
* 有组织组长不能分配 org=NULL 红娘。违规走 DataScopeGuard.deny（审计 + 403）。
|
||||
*/
|
||||
private void assertAssignScope(String assignerOperatorId, boolean hasGlobalAssign,
|
||||
String targetOperatorId, String denyMessage,
|
||||
String auditResourceId) {
|
||||
if (hasGlobalAssign) {
|
||||
return; // 平台授权人员（matchmaker.assign），不限组织
|
||||
}
|
||||
Operator assigner = operatorMapper.findById(assignerOperatorId)
|
||||
.orElseThrow(() -> new BusinessException(ApiResponseCode.NOT_FOUND, "操作者不存在"));
|
||||
Operator target = operatorMapper.findById(targetOperatorId)
|
||||
.orElseThrow(() -> new BusinessException(ApiResponseCode.NOT_FOUND, "目标红娘不存在"));
|
||||
// Objects.equals 的 NULL=NULL → true 语义即「平台直属对平台直属」规则
|
||||
if (Objects.equals(assigner.getOrganizationId(), target.getOrganizationId())) {
|
||||
return;
|
||||
}
|
||||
dataScopeGuard.deny(assignerOperatorId, RESOURCE_TYPE, auditResourceId, denyMessage);
|
||||
}
|
||||
|
||||
/** 服务单联动（同事务）：仅 submitted 状态允许关联分配并置为 assigned。 */
|
||||
private void linkServiceRow(String serviceId, String matchmakerOperatorId) {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) {
|
||||
throw new BusinessException(ApiResponseCode.NOT_FOUND, "关联服务单不存在");
|
||||
}
|
||||
if (!Constants.MATCHMAKER_STATUS_SUBMITTED.equals(service.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "服务单当前状态不允许关联分配");
|
||||
}
|
||||
service.setAssignedOperatorId(matchmakerOperatorId);
|
||||
service.setStatus(Constants.MATCHMAKER_STATUS_ASSIGNED);
|
||||
service.setAssignedAt(Instant.now());
|
||||
serviceMapper.updateById(service);
|
||||
}
|
||||
|
||||
private MatchmakerAssignment requireAssignment(String assignmentId) {
|
||||
return assignmentMapper.findById(assignmentId)
|
||||
.orElseThrow(() -> new BusinessException(ApiResponseCode.NOT_FOUND, "分配记录不存在"));
|
||||
}
|
||||
|
||||
private Operator requireActiveOperator(String operatorId, String notFoundMessage) {
|
||||
Operator operator = operatorMapper.findById(operatorId)
|
||||
.orElseThrow(() -> new BusinessException(ApiResponseCode.NOT_FOUND, notFoundMessage));
|
||||
if (!"active".equals(operator.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "目标红娘账号非 active 状态");
|
||||
}
|
||||
return operator;
|
||||
}
|
||||
|
||||
/** 终态一律拒绝再转换（D5 状态机矩阵）。 */
|
||||
private void assertActiveForTransition(MatchmakerAssignment assignment, String actionLabel) {
|
||||
if (!Constants.ASSIGNMENT_STATUS_ACTIVE.equals(assignment.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT,
|
||||
"分配已处于终态（" + assignment.getStatus() + "），不允许" + actionLabel);
|
||||
}
|
||||
}
|
||||
|
||||
private void requireReason(String reason, String message) {
|
||||
if (reason == null || reason.isBlank()) {
|
||||
throw new BusinessException(ApiResponseCode.VALIDATION_ERROR, message);
|
||||
}
|
||||
}
|
||||
|
||||
/** afterData 摘要：只记 operatorId/scope/reason（D5 审计口径，不落敏感数据）。 */
|
||||
private String auditSummary(String matchmakerOperatorId, String scope, String reason) {
|
||||
String summary = "matchmakerOperatorId=" + matchmakerOperatorId
|
||||
+ ";scope=" + scope
|
||||
+ ";reason=" + (reason == null ? "" : reason);
|
||||
return summary.length() > 500 ? summary.substring(0, 500) : summary;
|
||||
}
|
||||
|
||||
private void saveAudit(String operatorId, String action, String resourceId, String afterData) {
|
||||
AuditLog auditLog = new AuditLog();
|
||||
auditLog.setOperatorId(operatorId);
|
||||
auditLog.setAction(action);
|
||||
auditLog.setResourceType(RESOURCE_TYPE);
|
||||
auditLog.setResourceId(resourceId);
|
||||
auditLog.setAfterData(afterData);
|
||||
auditLogMapper.insert(auditLog);
|
||||
}
|
||||
}
|
||||
+104
-44
@@ -1,6 +1,5 @@
|
||||
package com.danyang.match.platform.matchmaker.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.danyang.match.platform.audit.entity.AuditLog;
|
||||
import com.danyang.match.platform.audit.mapper.AuditLogMapper;
|
||||
import com.danyang.match.platform.matchmaker.dto.MatchmakerRecommendationDTO;
|
||||
@@ -14,6 +13,7 @@ import com.danyang.match.platform.notification.service.NotificationService;
|
||||
import com.danyang.match.platform.profile.entity.UserProfile;
|
||||
import com.danyang.match.platform.profile.mapper.UserProfileMapper;
|
||||
import com.danyang.match.platform.shared.constant.Constants;
|
||||
import com.danyang.match.platform.shared.security.DataScopeGuard;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -27,6 +27,19 @@ import java.util.stream.Collectors;
|
||||
import com.danyang.match.platform.shared.enums.ApiResponseCode;
|
||||
import com.danyang.match.platform.shared.exception.GlobalExceptionHandler.BusinessException;
|
||||
|
||||
/**
|
||||
* 红娘服务服务层。
|
||||
*
|
||||
* <p>ZC-MM-002（A1）变更说明：
|
||||
* <ul>
|
||||
* <li>claimService（红娘接单）已删除（D3：不保留组长认领），服务对象归属统一由
|
||||
* matchmaker_assignments 建模；</li>
|
||||
* <li>写接口（recommend/followup/complete）归属判定切换到
|
||||
* {@link ServiceAssignmentPolicy}（D4），拒绝统一走 DataScopeGuard（审计 + 403）；
|
||||
* 存量兼容：assignment 表上线前的服务单仍按 assigned_operator_id 判定（005 阶段收敛）；</li>
|
||||
* <li>assignService 同事务联动「创建分配 + 服务单置 assigned」。</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MatchmakerServiceService {
|
||||
@@ -39,6 +52,9 @@ public class MatchmakerServiceService {
|
||||
private final UserProfileMapper userProfileMapper;
|
||||
private final NotificationService notificationService;
|
||||
private final AuditLogMapper auditLogMapper;
|
||||
private final ServiceAssignmentPolicy serviceAssignmentPolicy;
|
||||
private final DataScopeGuard dataScopeGuard;
|
||||
private final MatchmakerAssignmentService matchmakerAssignmentService;
|
||||
|
||||
/**
|
||||
* 用户申请红娘服务
|
||||
@@ -82,43 +98,44 @@ public class MatchmakerServiceService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 分配服务给红娘
|
||||
* 分配服务给红娘（ZC-MM-002 / D4 联动版）。
|
||||
*
|
||||
* <p>同事务完成：① 创建 matchmaker_assignments 主责分配（含组织范围校验、
|
||||
* 唯一性约束、CREATE 审计，由 {@link MatchmakerAssignmentService#create} 承担）；
|
||||
* ② 服务单 submitted → assigned、写回 assigned_operator_id。
|
||||
* 任何一步失败整体回滚。
|
||||
*
|
||||
* @param serviceId 服务单 ID
|
||||
* @param assignerOperatorId 当前操作者（分配人，principal）
|
||||
* @param targetOperatorId 目标红娘
|
||||
* @param reason 分配理由（默认文案由 Controller 传入）
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerServiceRecord assignService(String serviceId, String operatorId, String organizationId) {
|
||||
public MatchmakerServiceRecord assignService(String serviceId, String assignerOperatorId,
|
||||
String targetOperatorId, String reason) {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) throw new BusinessException(ApiResponseCode.NOT_FOUND, "服务不存在");
|
||||
if (!Constants.MATCHMAKER_STATUS_SUBMITTED.equals(service.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "当前状态不允许分配");
|
||||
}
|
||||
|
||||
service.setAssignedOperatorId(operatorId);
|
||||
service.setOrganizationId(organizationId);
|
||||
service.setStatus(Constants.MATCHMAKER_STATUS_ASSIGNED);
|
||||
service.setAssignedAt(Instant.now());
|
||||
serviceMapper.updateById(service);
|
||||
|
||||
log.info("分配红娘服务: serviceId={}, operatorId={}", serviceId, operatorId);
|
||||
saveAuditLog(operatorId, "MATCHMAKER_ASSIGN", "matchmaker_service", serviceId, null, null);
|
||||
return service;
|
||||
}
|
||||
|
||||
/**
|
||||
* 红娘接单
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerServiceRecord claimService(String operatorId, String serviceId) {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) throw new BusinessException(ApiResponseCode.NOT_FOUND, "服务不存在");
|
||||
if (!Constants.MATCHMAKER_STATUS_ASSIGNED.equals(service.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "当前状态不允许接单");
|
||||
if (targetOperatorId == null || targetOperatorId.isBlank()) {
|
||||
throw new BusinessException(ApiResponseCode.VALIDATION_ERROR, "目标红娘必填");
|
||||
}
|
||||
|
||||
service.setStatus(Constants.MATCHMAKER_STATUS_IN_SERVICE);
|
||||
serviceMapper.updateById(service);
|
||||
// ① 创建分配（matchmaker.assign 入口为平台授权，hasGlobalAssign=true）
|
||||
matchmakerAssignmentService.create(assignerOperatorId, true,
|
||||
service.getUserId(), targetOperatorId, serviceId, reason, null);
|
||||
|
||||
log.info("红娘接单: operatorId={}, serviceId={}", operatorId, serviceId);
|
||||
return service;
|
||||
// ② 服务单联动（create 内已对 submitted 服务单置 assigned；此处再校验一次确保联动生效）
|
||||
MatchmakerServiceRecord after = serviceMapper.selectById(serviceId);
|
||||
if (!Constants.MATCHMAKER_STATUS_ASSIGNED.equals(after.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "服务单分配联动失败");
|
||||
}
|
||||
|
||||
log.info("分配红娘服务: serviceId={}, targetOperatorId={}, by={}",
|
||||
serviceId, targetOperatorId, assignerOperatorId);
|
||||
saveAuditLog(assignerOperatorId, "MATCHMAKER_ASSIGN", "matchmaker_service", serviceId, null, null);
|
||||
return after;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -132,10 +149,11 @@ public class MatchmakerServiceService {
|
||||
/**
|
||||
* 红娘推荐候选人给用户
|
||||
*
|
||||
* Phase 13 复验修复（D3）：补 assigned_operator 归属校验。
|
||||
* 此前只校验 service 存在，任何持 matchmaker.service 权限的 operator
|
||||
* 都能对**任意** serviceId 创建推荐（越权）。与
|
||||
* MatchmakerService.createRecommendation:118-121 的校验保持同一口径。
|
||||
* Phase 13 复验修复（D3）：补归属校验。
|
||||
* ZC-MM-002（D4）：归属判定切换到 {@link ServiceAssignmentPolicy}（matchmaker_assignments
|
||||
* 是服务对象归属的唯一事实源）；存量兼容：assignment 表上线前的服务单仍按
|
||||
* assigned_operator_id 判定。拒绝统一走 DataScopeGuard（DATA_SCOPE_DENIED 审计 + 403），
|
||||
* 不再抛裸 IllegalStateException。
|
||||
*
|
||||
* AGENTS.md #5：红娘只创建 pending_view 推荐记录，不替用户 Like。
|
||||
*/
|
||||
@@ -145,10 +163,8 @@ public class MatchmakerServiceService {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) throw new BusinessException(ApiResponseCode.NOT_FOUND, "服务不存在");
|
||||
|
||||
// Phase 13 D3：归属校验 —— 只有该服务的负责人才能推荐
|
||||
if (!operatorId.equals(service.getAssignedOperatorId())) {
|
||||
throw new IllegalStateException("您不是此服务的负责人");
|
||||
}
|
||||
// D4：归属校验 —— 只有该服务对象的负责人（分配持有人）才能推荐
|
||||
assertServiceAccess(operatorId, service);
|
||||
// 不能推荐给自己（服务申请人）
|
||||
if (service.getUserId() != null && service.getUserId().equals(targetUserId)) {
|
||||
throw new IllegalArgumentException("不能推荐用户给自己");
|
||||
@@ -182,11 +198,18 @@ public class MatchmakerServiceService {
|
||||
|
||||
/**
|
||||
* 红娘添加跟进记录
|
||||
*
|
||||
* ZC-MM-002（D4）：补归属校验（此前无任何校验，任何持 matchmaker.service 权限的
|
||||
* operator 可对任意 serviceId 写跟进 → 越权写）。判定口径同 recommendPartner。
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerFollowup addFollowup(String serviceId, String operatorId,
|
||||
String followupType, String content,
|
||||
String nextFollowupAt) {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) throw new BusinessException(ApiResponseCode.NOT_FOUND, "服务不存在");
|
||||
assertServiceAccess(operatorId, service);
|
||||
|
||||
MatchmakerFollowup followup = new MatchmakerFollowup();
|
||||
followup.setServiceId(serviceId);
|
||||
followup.setOperatorId(operatorId);
|
||||
@@ -204,11 +227,15 @@ public class MatchmakerServiceService {
|
||||
|
||||
/**
|
||||
* 完成服务
|
||||
*
|
||||
* ZC-MM-002（D4）：补归属校验（判定口径同 recommendPartner）；
|
||||
* operatorId 由 Controller 传入 principal，不信任请求参数。
|
||||
*/
|
||||
@Transactional
|
||||
public MatchmakerServiceRecord completeService(String serviceId) {
|
||||
public MatchmakerServiceRecord completeService(String serviceId, String operatorId) {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) throw new BusinessException(ApiResponseCode.NOT_FOUND, "服务不存在");
|
||||
assertServiceAccess(operatorId, service);
|
||||
if (!Constants.MATCHMAKER_STATUS_IN_SERVICE.equals(service.getStatus()) &&
|
||||
!Constants.MATCHMAKER_STATUS_WAITING_USER.equals(service.getStatus())) {
|
||||
throw new BusinessException(ApiResponseCode.CONFLICT, "当前状态不能完成");
|
||||
@@ -257,6 +284,14 @@ public class MatchmakerServiceService {
|
||||
.collect(java.util.stream.Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取红娘工作台数据。
|
||||
*
|
||||
* ZC-MM-002（D4）：today / completed 改为<b>本人口径</b>（该红娘名下的服务），
|
||||
* pendingCount 保留全局口径（待分配队列是分配权持有者的全局视图）；
|
||||
* inProgress 统计的状态口径由错误的 'processing' 修正为 'in_service'
|
||||
* （'processing' 不在 V009 chk_matchmaker_status 白名单，恒为 0）。
|
||||
*/
|
||||
public Map<String, Object> getDashboard(String operatorId) {
|
||||
long pendingCount = serviceMapper.countSubmitted();
|
||||
long inProgressCount = serviceMapper.countInProgressByOperator(operatorId);
|
||||
@@ -264,13 +299,11 @@ public class MatchmakerServiceService {
|
||||
Map<String, Object> dashboard = new HashMap<>();
|
||||
dashboard.put("pendingCount", pendingCount);
|
||||
dashboard.put("inProgressCount", inProgressCount);
|
||||
long todayCount = serviceMapper.selectCount(
|
||||
new LambdaQueryWrapper<MatchmakerServiceRecord>()
|
||||
.eq(MatchmakerServiceRecord::getStatus, "submitted"));
|
||||
// 本人口径：今天新流转到该红娘名下（按 assigned_at）的服务数
|
||||
long todayCount = serviceMapper.countTodayByOperator(operatorId);
|
||||
dashboard.put("todayCount", todayCount);
|
||||
long completedCount = serviceMapper.selectCount(
|
||||
new LambdaQueryWrapper<MatchmakerServiceRecord>()
|
||||
.eq(MatchmakerServiceRecord::getStatus, "completed"));
|
||||
// 本人口径：该红娘名下已完成的服务数
|
||||
long completedCount = serviceMapper.countCompletedByOperator(operatorId);
|
||||
dashboard.put("completedCount", completedCount);
|
||||
return dashboard;
|
||||
}
|
||||
@@ -302,7 +335,12 @@ public class MatchmakerServiceService {
|
||||
MatchmakerServiceRecord service = serviceMapper.selectById(serviceId);
|
||||
if (service == null) return null;
|
||||
|
||||
boolean isOwner = requesterId != null && requesterId.equals(service.getAssignedOperatorId());
|
||||
// ZC-MM-002（D4）：负责人判定 = assignment 判定器优先，存量服务单回退 assigned_operator_id
|
||||
boolean isOwner = requesterId != null &&
|
||||
(service.getUserId() == null
|
||||
? requesterId.equals(service.getAssignedOperatorId())
|
||||
: serviceAssignmentPolicy.canAccessUser(requesterId, service.getUserId())
|
||||
|| requesterId.equals(service.getAssignedOperatorId()));
|
||||
|
||||
Map<String, Object> detail = new HashMap<>();
|
||||
detail.put("serviceId", service.getId());
|
||||
@@ -355,6 +393,28 @@ public class MatchmakerServiceService {
|
||||
return java.time.Period.between(birthDate, java.time.LocalDate.now()).getYears();
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务归属校验（ZC-MM-002 / D4）。
|
||||
*
|
||||
* 判定口径：
|
||||
* 1. assignment 判定器优先 —— 操作者对该服务申请人持有生效中的 matchmaker_assignments
|
||||
* 分配（含惰性过期）；判定无效时由 Policy 走 DataScopeGuard.deny
|
||||
* （落 DATA_SCOPE_DENIED 审计 + 抛 AccessDeniedException → 403）。
|
||||
* 2. 存量兼容：assignment 表上线前的服务单仍按 assigned_operator_id 判定
|
||||
* （与 V053 存量回填语义一致；005 阶段读口径统一时收敛）。
|
||||
*/
|
||||
private void assertServiceAccess(String operatorId, MatchmakerServiceRecord service) {
|
||||
if (operatorId != null && service.getUserId() != null
|
||||
&& serviceAssignmentPolicy.canAccessUser(operatorId, service.getUserId())) {
|
||||
return;
|
||||
}
|
||||
if (operatorId != null && operatorId.equals(service.getAssignedOperatorId())) {
|
||||
return;
|
||||
}
|
||||
dataScopeGuard.deny(operatorId, "matchmaker_service", service.getId(),
|
||||
"您不是此服务对象的负责人，禁止操作");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取红娘为该用户推荐的人员列表
|
||||
|
||||
+71
@@ -0,0 +1,71 @@
|
||||
package com.danyang.match.platform.matchmaker.service;
|
||||
|
||||
import com.danyang.match.platform.matchmaker.entity.MatchmakerAssignment;
|
||||
import com.danyang.match.platform.matchmaker.mapper.MatchmakerAssignmentMapper;
|
||||
import com.danyang.match.platform.shared.security.DataScopeGuard;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* 服务对象分配判定器（ZC-MM-002 / A1，架构师设计 D6）。
|
||||
*
|
||||
* <p>红娘对某个用户能否读/写，唯一事实源是 matchmaker_assignments 里
|
||||
* 「生效中的分配」（active 且未过有效期）。所有读路径前先 {@link #expireOverdue}
|
||||
* 惰性过期（无定时任务，D5 决策），保证过期分配立即失效。
|
||||
*
|
||||
* <p>判定无效时统一走 {@link DataScopeGuard#deny}：先落 DATA_SCOPE_DENIED 审计，
|
||||
* 再抛 AccessDeniedException（全局处理器映射为 403 + FORBIDDEN）。
|
||||
*/
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ServiceAssignmentPolicy {
|
||||
|
||||
private final MatchmakerAssignmentMapper assignmentMapper;
|
||||
private final DataScopeGuard dataScopeGuard;
|
||||
|
||||
/**
|
||||
* 惰性过期：把 expires_at 已届满的 active 分配置为 expired 并落库。
|
||||
* 读路径入口统一调用；无定时任务（D5 决策）。
|
||||
*/
|
||||
public int expireOverdue() {
|
||||
return assignmentMapper.expireOverdue();
|
||||
}
|
||||
|
||||
/** 查询某红娘对某用户的生效中分配；不存在返回 empty。 */
|
||||
public Optional<MatchmakerAssignment> findActiveAssignment(String operatorId, String userId) {
|
||||
expireOverdue();
|
||||
return assignmentMapper.findActiveByOperatorAndUser(operatorId, userId);
|
||||
}
|
||||
|
||||
/** 某红娘当前是否可访问某用户（存在生效中的分配）。 */
|
||||
public boolean canAccessUser(String operatorId, String userId) {
|
||||
return findActiveAssignment(operatorId, userId).isPresent();
|
||||
}
|
||||
|
||||
/**
|
||||
* 断言某红娘对某用户持有生效中的分配；无效时：
|
||||
* 落 DATA_SCOPE_DENIED 审计 + 抛 AccessDeniedException（403）。
|
||||
*
|
||||
* @param resourceType 审计 resourceType（如 matchmaker_service / matchmaker_user）
|
||||
* @return 生效中的分配记录（永不返回 null）
|
||||
*/
|
||||
public MatchmakerAssignment assertActiveAssignment(String operatorId, String userId,
|
||||
String resourceType) {
|
||||
Optional<MatchmakerAssignment> found = findActiveAssignment(operatorId, userId);
|
||||
if (found.isPresent()) {
|
||||
return found.get();
|
||||
}
|
||||
dataScopeGuard.deny(operatorId, resourceType, userId,
|
||||
"未持有该服务对象的分配关系，禁止访问");
|
||||
return null; // deny 必然抛出，此行不可达
|
||||
}
|
||||
|
||||
/** 某红娘名下全部生效中的分配（GET /my 口径），读前惰性过期。 */
|
||||
public List<MatchmakerAssignment> findActiveByOperator(String operatorId) {
|
||||
expireOverdue();
|
||||
return assignmentMapper.findActiveByOperator(operatorId);
|
||||
}
|
||||
}
|
||||
@@ -330,6 +330,25 @@ public final class Constants {
|
||||
public static final String RECOMMENDATION_SOURCE_MATCHMAKER = "matchmaker";
|
||||
public static final String PROFILE_STATUS_PENDING_REVIEW = "pending_review";
|
||||
|
||||
// ========== 服务对象分配（ZC-MM-002 / A1，与 V053 数据库 CHECK 白名单一致）==========
|
||||
// 状态机：active → transferred / revoked / ended；expires_at 届满由判定器惰性置 expired。
|
||||
// 终态（ended/revoked/transferred/expired）一律拒绝再转换。
|
||||
public static final String ASSIGNMENT_STATUS_ACTIVE = "active";
|
||||
public static final String ASSIGNMENT_STATUS_ENDED = "ended";
|
||||
public static final String ASSIGNMENT_STATUS_REVOKED = "revoked";
|
||||
public static final String ASSIGNMENT_STATUS_TRANSFERRED = "transferred";
|
||||
public static final String ASSIGNMENT_STATUS_EXPIRED = "expired";
|
||||
|
||||
// 分配范围：primary（主责，同用户仅一条生效中）/ collaborating（协同）
|
||||
public static final String ASSIGNMENT_SCOPE_PRIMARY = "primary";
|
||||
public static final String ASSIGNMENT_SCOPE_COLLABORATING = "collaborating";
|
||||
|
||||
// 服务对象分配审计 action（resourceType = matchmaker_assignment）
|
||||
public static final String AUDIT_ACTION_ASSIGNMENT_CREATE = "MATCHMAKER_ASSIGNMENT_CREATE";
|
||||
public static final String AUDIT_ACTION_ASSIGNMENT_TRANSFER = "MATCHMAKER_ASSIGNMENT_TRANSFER";
|
||||
public static final String AUDIT_ACTION_ASSIGNMENT_REVOKE = "MATCHMAKER_ASSIGNMENT_REVOKE";
|
||||
public static final String AUDIT_ACTION_ASSIGNMENT_END = "MATCHMAKER_ASSIGNMENT_END";
|
||||
|
||||
// ========== V1.1 本地资格审核 ==========
|
||||
/** 本地资格审核任务类型 */
|
||||
public static final String REVIEW_TYPE_LOCAL_ELIGIBILITY = "local_eligibility";
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
-- ============================================================
|
||||
-- V053: 服务对象分配表（ZC-MM-002 / A1 服务对象分配建模）
|
||||
--
|
||||
-- 建模决策（架构师设计 D1/D5）：
|
||||
-- * 决策文档 5.1 的 matchmaker_user_id 对应 operators 主体，
|
||||
-- 定名 matchmaker_operator_id（沿用 matchmaker_services.assigned_operator_id 惯例）。
|
||||
-- * status 状态机：active → transferred / revoked / ended；
|
||||
-- expires_at < now 的 active 行由 ServiceAssignmentPolicy 惰性置 expired（无定时任务）；
|
||||
-- 终态（transferred/revoked/ended/expired）一律不允许再次转换。
|
||||
-- * assignment_scope：primary（主责）/ collaborating（协同）。
|
||||
-- * 同一用户同时最多一条 active + primary 分配 → 部分唯一索引兜底
|
||||
-- （业务层 SELECT-then-INSERT 有竞态，只有 DB 唯一索引能兜住）。
|
||||
--
|
||||
-- 存量回填说明：
|
||||
-- matchmaker_services.assigned_operator_id IS NOT NULL 且服务仍处于非终态
|
||||
-- （assigned / in_service / waiting_user，与 V009 chk_matchmaker_status 白名单一致）的行，
|
||||
-- 回填为 active + primary 分配。assigned_by 无历史记录可考，取技术回填值
|
||||
-- = assigned_operator_id（仅表示"分配关系成立"，不代表当年实际操作者）。
|
||||
-- 幂等：NOT EXISTS 防重复回填（按 service_id 关联）。
|
||||
-- ============================================================
|
||||
|
||||
CREATE TABLE IF NOT EXISTS matchmaker_assignments (
|
||||
id UUID PRIMARY KEY,
|
||||
user_id UUID NOT NULL REFERENCES users(id),
|
||||
matchmaker_operator_id UUID NOT NULL REFERENCES operators(id),
|
||||
service_id UUID REFERENCES matchmaker_services(id),
|
||||
assigned_by UUID NOT NULL REFERENCES operators(id),
|
||||
assignment_scope VARCHAR(32) NOT NULL DEFAULT 'primary',
|
||||
assignment_reason VARCHAR(500) NOT NULL,
|
||||
status VARCHAR(32) NOT NULL DEFAULT 'active',
|
||||
assigned_at TIMESTAMPTZ,
|
||||
expires_at TIMESTAMPTZ,
|
||||
ended_at TIMESTAMPTZ,
|
||||
end_reason VARCHAR(500),
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
deleted_at TIMESTAMPTZ
|
||||
);
|
||||
|
||||
ALTER TABLE matchmaker_assignments ADD CONSTRAINT chk_mm_assignment_status CHECK (status IN (
|
||||
'active', 'ended', 'revoked', 'transferred', 'expired'
|
||||
));
|
||||
ALTER TABLE matchmaker_assignments ADD CONSTRAINT chk_mm_assignment_scope CHECK (assignment_scope IN (
|
||||
'primary', 'collaborating'
|
||||
));
|
||||
|
||||
-- 部分唯一索引：同一用户最多一条「生效中的主责分配」。
|
||||
-- 终态行（ended/revoked/transferred/expired）不占位，允许历史多条。
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uq_mm_assignment_active_primary
|
||||
ON matchmaker_assignments(user_id)
|
||||
WHERE status = 'active' AND assignment_scope = 'primary';
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_mm_assignment_operator ON matchmaker_assignments(matchmaker_operator_id, status);
|
||||
CREATE INDEX IF NOT EXISTS idx_mm_assignment_user ON matchmaker_assignments(user_id, status);
|
||||
CREATE INDEX IF NOT EXISTS idx_mm_assignment_service ON matchmaker_assignments(service_id);
|
||||
|
||||
-- 存量回填（幂等）
|
||||
INSERT INTO matchmaker_assignments (
|
||||
id, user_id, matchmaker_operator_id, service_id, assigned_by,
|
||||
assignment_scope, assignment_reason, status, assigned_at, created_at, updated_at
|
||||
)
|
||||
SELECT
|
||||
gen_random_uuid(),
|
||||
ms.user_id,
|
||||
ms.assigned_operator_id,
|
||||
ms.id,
|
||||
ms.assigned_operator_id, -- assigned_by 为技术回填值：历史分配操作者未记录
|
||||
'primary',
|
||||
'V053 存量回填：原始分配人未记录',
|
||||
'active',
|
||||
COALESCE(ms.assigned_at, NOW()),
|
||||
NOW(),
|
||||
NOW()
|
||||
FROM matchmaker_services ms
|
||||
WHERE ms.assigned_operator_id IS NOT NULL
|
||||
AND ms.status IN ('assigned', 'in_service', 'waiting_user')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM matchmaker_assignments ma WHERE ma.service_id = ms.id
|
||||
);
|
||||
@@ -0,0 +1,38 @@
|
||||
-- ============================================================
|
||||
-- V054: 新增红娘组长角色与团队分配权限（ZC-MM-002 / A1，架构师设计 D2）
|
||||
--
|
||||
-- 角色权限边界：
|
||||
-- * matchmaker_leader（014）授 view(020) + service(022) + team.assign(023)，
|
||||
-- **不给** matchmaker.assign(021) —— 组长只能在同组织范围内分配；
|
||||
-- 组织边界判定：组长团队边界 = 同 organization_id，NULL=NULL 视为平台直属
|
||||
-- （平台直属组长只能分配平台直属红娘；有组织组长不能分配 org=NULL 红娘；
|
||||
-- org=NULL 普通红娘只能由 matchmaker.assign 持有者分配 —— 该技术默认
|
||||
-- 写在 ServiceAssignmentPolicy / MatchmakerAssignmentService 代码注释，
|
||||
-- 治理登记后续补充）。
|
||||
-- * 普通红娘（005）权限现状不变（view/service），由 V052 授予。
|
||||
--
|
||||
-- 幂等：全部 ON CONFLICT DO NOTHING（对照 V052 风格）。
|
||||
-- ============================================================
|
||||
|
||||
INSERT INTO roles (id, code, name, description, system_role) VALUES (
|
||||
'00000000-0000-0000-0000-000000000014',
|
||||
'matchmaker_leader',
|
||||
'红娘组长',
|
||||
'公益红娘团队组长，可在同组织范围内分配/转分配服务对象',
|
||||
TRUE
|
||||
) ON CONFLICT (id) DO NOTHING;
|
||||
|
||||
INSERT INTO permissions (id, code, name, module, description) VALUES (
|
||||
'10000000-0000-0000-0000-000000000023',
|
||||
'matchmaker.team.assign',
|
||||
'红娘团队分配',
|
||||
'matchmaker',
|
||||
'在组长同组织范围内分配/转分配/撤销/结束服务对象分配'
|
||||
) ON CONFLICT (id) DO NOTHING;
|
||||
|
||||
-- 红娘组长：view + service + team.assign（不含 matchmaker.assign）
|
||||
INSERT INTO role_permissions (role_id, permission_id)
|
||||
SELECT '00000000-0000-0000-0000-000000000014', id
|
||||
FROM permissions
|
||||
WHERE code IN ('matchmaker.view', 'matchmaker.service', 'matchmaker.team.assign')
|
||||
ON CONFLICT (role_id, permission_id) DO NOTHING;
|
||||
Reference in New Issue
Block a user