refactor: approval flow status permission

AgAngle · AgAngle · commit f8fdb46e621e · 2026-04-22T14:51:17.000+08:00
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/constants/ApprovalFormTypeEnum.java b/backend/crm/src/main/java/cn/cordys/crm/approval/constants/ApprovalFormTypeEnum.java
@@ -6,21 +6,27 @@
 public enum ApprovalFormTypeEnum {
 
     /** 报价 */
-    QUOTATION("QTE-APV"),
+    QUOTATION("QTE-APV", "OPPORTUNITY_MANAGEMENT_QUOTATION"),
     /** 合同 */
-    CONTRACT("CTR-APV"),
+    CONTRACT("CTR-APV", "CONTRACT"),
     /** 发票 */
-    INVOICE("INV-APV"),
+    INVOICE("INV-APV", "CONTRACT_INVOICE"),
     /** 订单 */
-    ORDER("ORD-APV");
+    ORDER("ORD-APV", "ORDER");
 
     private final String prefix;
+    private final String permissionId;
 
-    ApprovalFormTypeEnum(String prefix) {
+    ApprovalFormTypeEnum(String prefix, String permissionId) {
         this.prefix = prefix;
+        this.permissionId = permissionId;
     }
 
     public String getPrefix() {
         return prefix;
     }
+
+    public String getPermissionId() {
+        return permissionId;
+    }
 }
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/dto/StatusPermissionDTO.java b/backend/crm/src/main/java/cn/cordys/crm/approval/dto/StatusPermissionDTO.java
@@ -0,0 +1,19 @@
+package cn.cordys.crm.approval.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 状态权限配置DTO
+ */
+@Data
+public class StatusPermissionDTO {
+    @Schema(description = "审批状态")
+    private String approvalStatus;
+
+    @Schema(description = "权限")
+    private String permission;
+
+    @Schema(description = "是否启用")
+    private Boolean enabled;
+}
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalFlowAddRequest.java b/backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalFlowAddRequest.java
@@ -3,6 +3,7 @@
 import cn.cordys.common.constants.EnumValue;
 import cn.cordys.crm.approval.constants.DuplicateApproverRuleEnum;
 import cn.cordys.crm.approval.constants.ApprovalFormTypeEnum;
+import cn.cordys.crm.approval.dto.StatusPermissionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -50,7 +51,7 @@ public class ApprovalFlowAddRequest {
     private Boolean requireComment;
 
     @Schema(description = "状态权限配置")
-    private String statusPermissions;
+    private List<StatusPermissionDTO> statusPermissions;
 
     @Schema(description = "节点配置列表")
     private List<ApprovalNodeRequest> nodes;
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalFlowUpdateRequest.java b/backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalFlowUpdateRequest.java
@@ -2,6 +2,7 @@
 
 import cn.cordys.common.constants.EnumValue;
 import cn.cordys.crm.approval.constants.DuplicateApproverRuleEnum;
+import cn.cordys.crm.approval.dto.StatusPermissionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -48,7 +49,7 @@ public class ApprovalFlowUpdateRequest {
     private Boolean requireComment;
 
     @Schema(description = "状态权限配置")
-    private String statusPermissions;
+    private List<StatusPermissionDTO> statusPermissions;
 
     @Schema(description = "节点配置列表")
     private List<ApprovalNodeRequest> nodes;
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/dto/response/ApprovalFlowDetailResponse.java b/backend/crm/src/main/java/cn/cordys/crm/approval/dto/response/ApprovalFlowDetailResponse.java
@@ -1,5 +1,7 @@
 package cn.cordys.crm.approval.dto.response;
 
+import cn.cordys.common.dto.OptionDTO;
+import cn.cordys.crm.approval.dto.StatusPermissionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -47,8 +49,11 @@ public class ApprovalFlowDetailResponse {
     @Schema(description = "是否必须填写审批意见")
     private Boolean requireComment;
 
+    @Schema(description = "对应资源表单的权限列表")
+    private List<OptionDTO> permissions;
+
     @Schema(description = "状态权限配置")
-    private String statusPermissions;
+    private List<StatusPermissionDTO> statusPermissions;
 
     @Schema(description = "节点配置列表")
     private List<ApprovalNodeResponse> nodes;
diff --git a/backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalFlowService.java b/backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalFlowService.java
@@ -5,21 +5,26 @@
 import cn.cordys.aspectj.constants.LogType;
 import cn.cordys.aspectj.context.OperationLogContext;
 import cn.cordys.aspectj.dto.LogContextInfo;
+import cn.cordys.common.dto.OptionDTO;
 import cn.cordys.common.exception.GenericException;
 import cn.cordys.common.pager.PageUtils;
 import cn.cordys.common.pager.Pager;
+import cn.cordys.common.permission.Permission;
+import cn.cordys.common.permission.PermissionDefinitionItem;
 import cn.cordys.common.response.result.CrmHttpResultCode;
 import cn.cordys.common.uid.IDGenerator;
 import cn.cordys.common.util.BeanUtils;
 import cn.cordys.common.util.JSON;
 import cn.cordys.crm.approval.constants.ApprovalFormTypeEnum;
 import cn.cordys.crm.approval.constants.ApprovalNodeTypeEnum;
 import cn.cordys.crm.approval.domain.*;
-import cn.cordys.crm.approval.dto.response.*;
+import cn.cordys.crm.approval.dto.StatusPermissionDTO;
 import cn.cordys.crm.approval.dto.request.*;
+import cn.cordys.crm.approval.dto.response.*;
 import cn.cordys.crm.system.constants.SystemResultCode;
 import cn.cordys.crm.approval.log.ApprovalFlowLogDTO;
 import cn.cordys.crm.approval.mapper.ExtApprovalFlowMapper;
+import cn.cordys.crm.system.service.RoleService;
 import cn.cordys.mybatis.BaseMapper;
 import cn.cordys.mybatis.lambda.LambdaQueryWrapper;
 import com.github.pagehelper.Page;
@@ -51,6 +56,8 @@ public class ApprovalFlowService {
     private BaseMapper<ApprovalNodeCondition> approvalNodeConditionMapper;
     @Resource
     private BaseMapper<ApprovalNodeLink> approvalNodeLinkMapper;
+    @Resource
+    private RoleService roleService;
 
     /**
      * 分页查询审批流列表
@@ -73,11 +80,16 @@ public ApprovalFlowDetailResponse getDetail(String id, String organizationId) {
 
         ApprovalFlowDetailResponse response = convertToDetailResponse(flow);
 
+        List<Permission> permissions = getPermissionsByFormType(flow.getFormType());
+
+        // 设置对应资源的权限列表
+        response.setPermissions(getResourcePermissions(permissions));
+
         // 查询大字段表
         ApprovalFlowBlob blob = approvalFlowBlobMapper.selectByPrimaryKey(id);
         if (blob != null) {
             response.setDescription(blob.getDescription());
-            response.setStatusPermissions(blob.getStatusPermissions());
+            response.setStatusPermissions(parseStatusPermissions(response.getPermissions(), blob.getStatusPermissions()));
         }
 
         // 查询节点配置并构建树状结构
@@ -113,7 +125,7 @@ public ApprovalFlow add(ApprovalFlowAddRequest request, String userId, String or
         ApprovalFlowBlob blob = new ApprovalFlowBlob();
         blob.setId(flow.getId());
         blob.setDescription(request.getDescription());
-        blob.setStatusPermissions(request.getStatusPermissions());
+        blob.setStatusPermissions(JSON.toJSONString(request.getStatusPermissions()));
         approvalFlowBlobMapper.insert(blob);
 
         // 保存节点配置
@@ -162,7 +174,7 @@ public ApprovalFlow update(ApprovalFlowUpdateRequest request, String userId, Str
         ApprovalFlowBlob blob = new ApprovalFlowBlob();
         blob.setId(flow.getId());
         blob.setDescription(request.getDescription());
-        blob.setStatusPermissions(request.getStatusPermissions());
+        blob.setStatusPermissions(JSON.toJSONString(request.getStatusPermissions()));
         approvalFlowBlobMapper.updateById(blob);
 
         // 删除原有节点配置并重新保存
@@ -487,4 +499,84 @@ private ApprovalFlowLogDTO buildModifiedLogDTO(ApprovalFlowUpdateRequest request
         logDTO.setDescription(request.getDescription());
         return logDTO;
     }
+
+    /**
+     * 获取对应资源的权限列表
+     */
+    private List<OptionDTO> getResourcePermissions(List<Permission> permissions) {
+        return permissions.stream()
+                .map(p -> new OptionDTO(p.getId(), p.getName()))
+                .collect(Collectors.toList());
+    }
+
+    private List<Permission> getPermissionsByFormType(String formType) {
+        List<PermissionDefinitionItem> permissionSetting = roleService.getPermissionSetting();
+        String permissionId = ApprovalFormTypeEnum.valueOf(formType).getPermissionId();
+        List<Permission> permissions = findPermissionsByPermissionId(permissionSetting, permissionId);
+        if (permissions == null) {
+            return List.of();
+        }
+        return permissions;
+    }
+
+    /**
+     * 解析状态权限配置
+     */
+    private List<StatusPermissionDTO> parseStatusPermissions(List<OptionDTO> permissions, String statusPermissions) {
+        if (StringUtils.isBlank(statusPermissions)) {
+            return null;
+        }
+        // 解析已保存的状态权限配置
+        List<StatusPermissionDTO> savedPermissions = JSON.parseArray(statusPermissions, StatusPermissionDTO.class);
+
+        // 获取所有审批状态
+        Set<String> approvalStatuses = savedPermissions.stream()
+                .map(StatusPermissionDTO::getApprovalStatus)
+                .collect(Collectors.toSet());
+
+        // 构建已保存权限的映射：(审批状态, 权限ID) -> StatusPermissionDTO
+        Map<String, StatusPermissionDTO> savedPermissionMap = savedPermissions.stream()
+                .collect(Collectors.toMap(
+                        p -> p.getApprovalStatus() + ":" + p.getPermission(),
+                        p -> p));
+
+        // 更新权限名称并补充缺失的权限
+        List<StatusPermissionDTO> updatedPermissions = new ArrayList<>();
+        for (String approvalStatus : approvalStatuses) {
+            for (OptionDTO permission : permissions) {
+                String key = approvalStatus + ":" + permission.getId();
+                StatusPermissionDTO item = savedPermissionMap.get(key);
+                if (item != null) {
+                    // 更新权限名称
+                    item.setEnabled(true);
+                    updatedPermissions.add(item);
+                } else {
+                    // 添加缺失的权限，默认不启用
+                    StatusPermissionDTO newItem = new StatusPermissionDTO();
+                    newItem.setApprovalStatus(approvalStatus);
+                    newItem.setPermission(permission.getId());
+                    newItem.setEnabled(false);
+                    updatedPermissions.add(newItem);
+                }
+            }
+        }
+
+        return updatedPermissions;
+    }
+
+    /**
+     * 根据权限ID查找对应的权限列表
+     */
+    private List<Permission> findPermissionsByPermissionId(List<PermissionDefinitionItem> permissionSetting, String permissionId) {
+        for (PermissionDefinitionItem module : permissionSetting) {
+            if (module.getChildren() != null) {
+                for (PermissionDefinitionItem resource : module.getChildren()) {
+                    if (resource.getId().equals(permissionId)) {
+                        return resource.getPermissions();
+                    }
+                }
+            }
+        }
+        return null;
+    }
 }
