fix: approval flow delete

Author: AgAngle

backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalFlowService.java

@@ -101,6 +101,8 @@ public class ApprovalFlowService {
 	private UserViewService userViewService;
 	@Resource
 	private ExtApprovalInstanceMapper extApprovalInstanceMapper;
+    @Resource
+	private ApprovalInstanceService approvalInstanceService;
 
     /**
      * 根据表单类型获取审批流状态权限配置
@@ -517,6 +519,9 @@ public void delete(String id, String organizationId) {
         // 删除主表
         approvalFlowMapper.deleteByPrimaryKey(id);
 
+        // 清除审批中的资源和待办
+        approvalInstanceService.clearApprovingInstanceOfFlow(id);
+
         // 设置日志上下文
         OperationLogContext.setResourceName(flow.getName());
     }
@@ -1113,10 +1118,14 @@ private boolean matchSingleCondition(FilterCondition condition, Map<String, Obje
         String fieldName = condition.getName();
         Object actualValue = fieldValueMap.get(fieldName);
 
+        // 获取动态转换后的值和操作符
+        Object expectedValue = condition.getCombineValue();
+        String operatorStr = condition.getCombineOperator();
+
         // 获取操作符枚举
         FilterCondition.CombineConditionOperator operator;
         try {
-            operator = FilterCondition.CombineConditionOperator.valueOf(condition.getOperator());
+            operator = FilterCondition.CombineConditionOperator.valueOf(operatorStr);
         } catch (IllegalArgumentException e) {
             return false;
         }
@@ -1133,8 +1142,6 @@ private boolean matchSingleCondition(FilterCondition condition, Map<String, Obje
             return false;
         }
 
-        Object expectedValue = condition.getValue();
-
         try {
             return switch (operator) {
                 case EQUALS -> matchEquals(actualValue, expectedValue);

backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalInstanceService.java

@@ -340,14 +340,18 @@ public void clearApprovingInstanceOfFlow(String flowId) {
 		List<String> instanceIds = instances.stream().map(ApprovalInstance::getId).toList();
 		List<ApprovalTask> approvalTasks = approvalTaskMapper.selectListByLambda(new LambdaQueryWrapper<ApprovalTask>().in(ApprovalTask::getInstanceId, instanceIds));
 		List<String> taskIds = approvalTasks.stream().map(ApprovalTask::getId).toList();
-		approvalTaskMapper.deleteByIds(taskIds);
-		approvalAddSignTaskMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalAddSignTask>().in(ApprovalAddSignTask::getTaskId, taskIds));
-		approvalReturnBackRecordMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalReturnBackRecord>().in(ApprovalReturnBackRecord::getTaskId, taskIds));
-		approvalRecordMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalRecord>().in(ApprovalRecord::getInstanceId, instanceIds));
-		List<ApprovalInstanceAttachment> instanceAttachments = approvalInstanceAttachmentMapper.selectListByLambda(new LambdaQueryWrapper<ApprovalInstanceAttachment>().in(ApprovalInstanceAttachment::getInstanceId, instanceIds));
-		approvalInstanceAttachmentMapper.deleteByIds(instanceAttachments.stream().map(ApprovalInstanceAttachment::getId).toList());
-		List<String> attachmentIds = instanceAttachments.stream().map(ApprovalInstanceAttachment::getAttachmentId).toList();
-		attachmentIds.forEach(id -> attachmentService.delete(id));
-		attachmentMapper.deleteByIds(attachmentIds);
+		if (CollectionUtils.isNotEmpty(taskIds)) {
+			approvalTaskMapper.deleteByIds(taskIds);
+			approvalAddSignTaskMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalAddSignTask>().in(ApprovalAddSignTask::getTaskId, taskIds));
+			approvalReturnBackRecordMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalReturnBackRecord>().in(ApprovalReturnBackRecord::getTaskId, taskIds));
+		}
+		if (CollectionUtils.isNotEmpty(taskIds)) {
+			approvalRecordMapper.deleteByLambda(new LambdaQueryWrapper<ApprovalRecord>().in(ApprovalRecord::getInstanceId, instanceIds));
+			List<ApprovalInstanceAttachment> instanceAttachments = approvalInstanceAttachmentMapper.selectListByLambda(new LambdaQueryWrapper<ApprovalInstanceAttachment>().in(ApprovalInstanceAttachment::getInstanceId, instanceIds));
+			approvalInstanceAttachmentMapper.deleteByIds(instanceAttachments.stream().map(ApprovalInstanceAttachment::getId).toList());
+			List<String> attachmentIds = instanceAttachments.stream().map(ApprovalInstanceAttachment::getAttachmentId).toList();
+			attachmentIds.forEach(id -> attachmentService.delete(id));
+			attachmentMapper.deleteByIds(attachmentIds);
+		}
 	}
 }