Add claim users field to approvals

Author: lazzyfu

backend/internal/orders/forms/admin.go

@@ -19,11 +19,13 @@ type AdminGetApprovalFlowsForm struct {
 type AdminUpdateApprovalFlowsForm struct {
 	Definition datatypes.JSON `form:"definition" json:"definition"`
 	Name       string         `form:"name"  json:"name" binding:"required,min=3,max=256"`
+	ClaimUsers []string       `form:"claim_users" json:"claim_users" binding:"required,min=1,dive,required"`
 }
 
 type AdminCreateApprovalFlowsForm struct {
 	Definition datatypes.JSON `form:"definition" json:"definition"`
 	Name       string         `form:"name"  json:"name" binding:"required,min=3,max=256"`
+	ClaimUsers []string       `form:"claim_users" json:"claim_users" binding:"required,min=1,dive,required"`
 }
 
 type AdminBindUsersToApprovalFlowForm struct {

backend/internal/orders/models/models.go

@@ -33,6 +33,7 @@ type InsightOrderRecords struct {
 	Applicant        string          `gorm:"type:varchar(32);not null;default:'';comment:申请人;index" json:"applicant"`
 	Organization     string          `gorm:"type:varchar(256);not null;default:'';index;comment:组织" json:"organization"`
 	Claimer          string          `gorm:"type:varchar(32);not null;default:'';comment:认领人;index" json:"claimer"`
+	ClaimUsers       datatypes.JSON  `gorm:"type:json;null;default:null;comment:可认领人员列表" json:"claim_users"`
 	Executor         string          `gorm:"type:varchar(32);not null;default:'';comment:工单执行人;index" json:"executor"`
 	Approver         datatypes.JSON  `gorm:"type:json;null;default:null;comment:工单审核人" json:"approver"`
 	Reviewer         datatypes.JSON  `gorm:"type:json;null;default:null;comment:工单复核人" json:"reviewer"`
@@ -55,6 +56,7 @@ type InsightApprovalFlows struct {
 	*models.Model
 	ApprovalID uuid.UUID      `gorm:"type:char(36);comment:审批流ID;uniqueIndex:uniq_approval_id" json:"approval_id"`
 	Name       string         `gorm:"type:varchar(64);not null;default:'';comment:审批流名称" json:"name"`
+	ClaimUsers datatypes.JSON `gorm:"type:json;null;default:null;comment:可认领人员列表" json:"claim_users"`
 	Definition datatypes.JSON `json:"definition"` // [{"stage":1, "approvers":["zhangsan","lisi"], "type":"AND", "stage_name": '部门审批'}]
 }
 

backend/internal/orders/services/admin.go

@@ -57,7 +57,7 @@ func (s *AdminGetApprovalFlowsService) Run() (responseData any, total int64, err
 	}
 
 	// 固定字段 + 去重
-	base = base.Select("a.id, a.name, a.definition, a.approval_id, a.created_at, a.updated_at").
+	base = base.Select("a.id, a.name, a.definition, a.claim_users, a.approval_id, a.created_at, a.updated_at").
 		Group("a.id")
 
 	total = pagination.Pager(&s.PaginationQ, base, &records)
@@ -71,10 +71,15 @@ type AdminUpdateApprovalFlowsService struct {
 }
 
 func (s *AdminUpdateApprovalFlowsService) Run() (responseData any, total int64, err error) {
+	claimUsers, err := marshalClaimUsers(s.ClaimUsers)
+	if err != nil {
+		return nil, 0, err
+	}
 	// 更新记录
 	result := global.App.DB.Model(&models.InsightApprovalFlows{}).Where("id=?", s.ID).Updates(map[string]any{
-		"definition": s.Definition,
-		"name":       s.Name,
+		"definition":  s.Definition,
+		"name":        s.Name,
+		"claim_users": claimUsers,
 	})
 
 	if result.Error != nil {
@@ -89,8 +94,13 @@ type AdminCreateApprovalFlowsService struct {
 }
 
 func (s *AdminCreateApprovalFlowsService) Run() error {
+	claimUsers, err := marshalClaimUsers(s.ClaimUsers)
+	if err != nil {
+		return err
+	}
 	flow := models.InsightApprovalFlows{
 		Definition: s.Definition,
+		ClaimUsers: claimUsers,
 		Name:       s.Name,
 		ApprovalID: uuid.New(),
 	}
@@ -162,7 +172,7 @@ type AdminGetApprovalFlowUsersService struct {
 
 func (s *AdminGetApprovalFlowUsersService) Run() (responseData any, total int64, err error) {
 	var records []models.InsightApprovalFlowUsers
-	tx := global.App.DB.Table("insight_approval_flow_users").Where("approval_id=?", s.ApprovalID).Scan(&records)
+	tx := global.App.DB.Table("insight_approval_flow_users").Where("approval_id=?", s.ApprovalID)
 
 	// 搜索
 	if s.Search != "" {

backend/internal/orders/services/claim_users.go

@@ -0,0 +1,72 @@
+package services
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/lazzyfu/goinsight/pkg/utils"
+	"gorm.io/datatypes"
+)
+
+func normalizeClaimUsers(users []string) ([]string, error) {
+	if len(users) == 0 {
+		return nil, fmt.Errorf("可领取人不能为空")
+	}
+
+	seen := make(map[string]struct{}, len(users))
+	result := make([]string, 0, len(users))
+	for _, user := range users {
+		u := strings.TrimSpace(user)
+		if u == "" {
+			continue
+		}
+		if _, ok := seen[u]; ok {
+			continue
+		}
+		seen[u] = struct{}{}
+		result = append(result, u)
+	}
+
+	if len(result) == 0 {
+		return nil, fmt.Errorf("可领取人不能为空")
+	}
+	return result, nil
+}
+
+func marshalClaimUsers(users []string) (datatypes.JSON, error) {
+	normalized, err := normalizeClaimUsers(users)
+	if err != nil {
+		return nil, err
+	}
+	data, err := json.Marshal(normalized)
+	if err != nil {
+		return nil, fmt.Errorf("序列化可领取人失败: %w", err)
+	}
+	return datatypes.JSON(data), nil
+}
+
+func parseClaimUsers(raw datatypes.JSON) ([]string, error) {
+	if len(raw) == 0 {
+		return nil, fmt.Errorf("审批流未配置可领取人")
+	}
+
+	var users []string
+	if err := json.Unmarshal(raw, &users); err != nil {
+		return nil, fmt.Errorf("解析可领取人失败: %w", err)
+	}
+
+	normalized, err := normalizeClaimUsers(users)
+	if err != nil {
+		return nil, err
+	}
+	return normalized, nil
+}
+
+func canUserClaim(raw datatypes.JSON, username string) (bool, error) {
+	claimUsers, err := parseClaimUsers(raw)
+	if err != nil {
+		return false, err
+	}
+	return utils.IsContain(claimUsers, username), nil
+}

backend/internal/orders/services/claim_users_test.go

@@ -0,0 +1,51 @@
+package services
+
+import (
+	"testing"
+
+	"gorm.io/datatypes"
+)
+
+func TestNormalizeClaimUsers(t *testing.T) {
+	t.Run("dedupe and trim", func(t *testing.T) {
+		users, err := normalizeClaimUsers([]string{" alice ", "bob", "alice", ""})
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if len(users) != 2 || users[0] != "alice" || users[1] != "bob" {
+			t.Fatalf("unexpected users: %#v", users)
+		}
+	})
+
+	t.Run("empty should fail", func(t *testing.T) {
+		if _, err := normalizeClaimUsers([]string{"", "   "}); err == nil {
+			t.Fatal("expected error for empty claim users")
+		}
+	})
+}
+
+func TestCanUserClaim(t *testing.T) {
+	raw := datatypes.JSON([]byte(`["alice","bob"]`))
+
+	ok, err := canUserClaim(raw, "alice")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !ok {
+		t.Fatal("alice should be allowed to claim")
+	}
+
+	ok, err = canUserClaim(raw, "charlie")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if ok {
+		t.Fatal("charlie should not be allowed to claim")
+	}
+}
+
+func TestCanUserClaimInvalidJSON(t *testing.T) {
+	if _, err := canUserClaim(datatypes.JSON([]byte(`{}`)), "alice"); err == nil {
+		t.Fatal("expected error for invalid claim users json")
+	}
+}

backend/internal/orders/services/commit.go

@@ -102,7 +102,7 @@ type CreateOrderService struct {
 	Audit    *parser.TiStmt
 }
 
-func (s *CreateOrderService) generateApprovalRecords(tx *gorm.DB, orderID uuid.UUID) error {
+func (s *CreateOrderService) generateApprovalRecords(tx *gorm.DB, orderID uuid.UUID) (datatypes.JSON, error) {
 	type FlowStage struct {
 		Type      string   `json:"type"`
 		Stage     int      `json:"stage"`
@@ -111,16 +111,25 @@ func (s *CreateOrderService) generateApprovalRecords(tx *gorm.DB, orderID uuid.U
 	}
 
 	var record models.InsightApprovalFlows
-	flow := tx.Table("insight_approval_flow_users a").Select(`b.definition`).
+	flow := tx.Table("insight_approval_flow_users a").Select(`b.definition, b.claim_users`).
 		Joins("inner join insight_approval_flow b on a.approval_id = b.approval_id").
 		Where("a.username = ?", s.Username).Take(&record)
 	if flow.Error != nil || flow.RowsAffected == 0 {
-		return fmt.Errorf("未找到您的审批流配置，请联系管理员设置")
+		return nil, fmt.Errorf("未找到您的审批流配置，请联系管理员设置")
+	}
+
+	claimUsers, err := parseClaimUsers(record.ClaimUsers)
+	if err != nil {
+		return nil, err
+	}
+	claimUsersJSON, err := marshalClaimUsers(claimUsers)
+	if err != nil {
+		return nil, err
 	}
 	// [{"type": "OR", "stage": 1, "approvers": ["zhangsan", "lisi"], "stage_name": "安全组审批"}, {"type": "AND", "stage": 1, "approvers": ["admin"], "stage_name": "部门负责人审批"}]
 	var stages []FlowStage
-	if err := json.Unmarshal(record.Definition, &stages); err != nil {
-		return fmt.Errorf("解析审批流JSON失败: %w", err)
+	if err = json.Unmarshal(record.Definition, &stages); err != nil {
+		return nil, fmt.Errorf("解析审批流JSON失败: %w", err)
 	}
 
 	for _, s := range stages {
@@ -134,11 +143,11 @@ func (s *CreateOrderService) generateApprovalRecords(tx *gorm.DB, orderID uuid.U
 				ApprovalType:   commonModels.EnumType(s.Type),
 			}
 			if err := tx.Create(&audit).Error; err != nil {
-				return fmt.Errorf("创建审批记录失败: %w", err)
+				return nil, fmt.Errorf("创建审批记录失败: %w", err)
 			}
 		}
 	}
-	return nil
+	return claimUsersJSON, nil
 }
 
 // 审核SQL
@@ -299,10 +308,15 @@ func (s *CreateOrderService) Run() error {
 			return err
 		}
 		// 生成审批流
-		err = s.generateApprovalRecords(tx, orderID)
+		claimUsers, err := s.generateApprovalRecords(tx, orderID)
 		if err != nil {
 			return err
 		}
+		if err := tx.Model(&models.InsightOrderRecords{}).
+			Where("order_id=?", orderID).
+			Update("claim_users", claimUsers).Error; err != nil {
+			return err
+		}
 		// 记录操作日志
 		if err := WriteOrderLog(tx, orderID.String(), s.Username, fmt.Sprintf("用户%s提交了工单", s.Username)); err != nil {
 			global.App.Log.Error("CreateOrderService.Run error:", err.Error())

backend/internal/orders/services/operate.go

@@ -188,6 +188,13 @@ func (s *ClaimOrderService) Run() (err error) {
 	if !utils.IsContain([]string{"APPROVED"}, string(record.Progress)) {
 		return fmt.Errorf("当前工单没有审批通过，无法认领")
 	}
+	allowed, err := canUserClaim(record.ClaimUsers, s.Username)
+	if err != nil {
+		return err
+	}
+	if !allowed {
+		return fmt.Errorf("您不在可领取人员列表中，无法认领工单")
+	}
 	// 认领操作
 	txErr := global.App.DB.Transaction(func(tx *gorm.DB) error {
 		// 更新工单认领人
@@ -249,6 +256,13 @@ func (s *TransferOrderService) Run() (err error) {
 	if record.Claimer != s.Username {
 		return fmt.Errorf("只有工单认领人才能转交工单")
 	}
+	allowed, err := canUserClaim(record.ClaimUsers, s.NewClaimer)
+	if err != nil {
+		return err
+	}
+	if !allowed {
+		return fmt.Errorf("转交目标用户不在可领取人员列表中")
+	}
 	// 转交操作
 	txErr := global.App.DB.Transaction(func(tx *gorm.DB) error {
 		// 更新工单执行人

www/src/views/admin/perms/flows/ApprovalFlowFormModal.vue

@@ -19,6 +19,30 @@
         <a-input v-model:value="formData.name" placeholder="请输入审批流名称" allow-clear />
       </a-form-item>
 
+      <a-form-item
+        label="可领取人"
+        name="claim_users"
+        :rules="[
+          {
+            required: true,
+            message: '请选择可领取人',
+          }
+        ]"
+        has-feedback
+      >
+        <a-select
+          v-model:value="formData.claim_users"
+          mode="multiple"
+          show-search
+          :filter-option="filterUserOption"
+          style="width: 100%"
+          placeholder="请选择可领取人（谁领取谁执行）"
+          :options="props.userOptions"
+          option-label-prop="label"
+          :max-tag-count="4"
+        />
+      </a-form-item>
+
       <div class="divider-section">
         <div class="divider-title">
           <span class="divider-icon">📋</span>
@@ -184,6 +208,10 @@ const handleCancel = () => {
 
 // 自定义校验（对动态数组字段使用自定义校验更可控）
 const validateDefinition = async () => {
+  const claimUsers = formData.value.claim_users || []
+  if (claimUsers.length === 0) {
+    return Promise.reject('请至少选择一个可领取人。')
+  }
   const definition = formData.value.definition
   if (!definition || definition.length === 0) {
     return Promise.reject('请至少配置一个审批阶段。')

www/src/views/admin/perms/flows/ApprovalFlowList.vue

@@ -23,6 +23,9 @@
           <template v-if="column.key === 'flow'">
             <a-tag color="blue">{{ record.definition.length }} 个阶段</a-tag>
           </template>
+          <template v-if="column.key === 'claim_users'">
+            <a-tag color="cyan">{{ record.claim_users.length }} 人</a-tag>
+          </template>
 
           <template v-if="column.key === 'action'">
             <a-space>
@@ -108,6 +111,7 @@ const uiData = reactive({
   tableColumns: [
     { title: '审批流名称', dataIndex: 'name', key: 'name', width: 150 },
     { title: '流程阶段数', dataIndex: 'definition', key: 'flow', width: 120 },
+    { title: '可领取人', dataIndex: 'claim_users', key: 'claim_users', width: 120 },
     { title: '创建时间', dataIndex: 'created_at', key: 'created_at' },
     { title: '更新时间', dataIndex: 'updated_at', key: 'updated_at' },
     { title: '操作', dataIndex: 'action', key: 'action', fixed: 'right', width: 250 },
@@ -117,6 +121,7 @@ const uiData = reactive({
 // form表单
 const defaultForm = {
   name: '',
+  claim_users: [],
   definition: [
     {
       stage: 1,
@@ -168,6 +173,11 @@ const fetchData = async () => {
         : item.definition
           ? JSON.parse(item.definition)
           : [],
+      claim_users: Array.isArray(item.claim_users)
+        ? item.claim_users
+        : item.claim_users
+          ? JSON.parse(item.claim_users)
+          : [],
     }))
 
     uiData.flows = res.data.map((flow) => ({
@@ -219,6 +229,11 @@ const handleEdit = (record) => {
 
   formState.value = {
     ...record,
+    claim_users: Array.isArray(record.claim_users)
+      ? record.claim_users
+      : typeof record.claim_users === 'string'
+        ? JSON.parse(record.claim_users)
+        : [],
     definition: definition.length > 0 ? definition : defaultForm.definition,
   }
   uiState.isModalOpen = true