From d7a614b1c4c520437e3a5b8695c94429dc523380 Mon Sep 17 00:00:00 2001
From: qimingjin <459816669@qq.com>
Date: Mon, 3 Jan 2022 21:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/snow/from/controller/SysFormInstanceController.java | 2 +-
 .../main/java/com/snow/from/domain/SysFormDataRecord.java   | 6 +++++-
 .../from/service/impl/SysFormDataRecordServiceImpl.java     | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java b/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java
index b4fb3fa..baa8bc6 100644
--- a/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java
+++ b/snow-from/src/main/java/com/snow/from/controller/SysFormInstanceController.java
@@ -184,7 +184,7 @@ public class SysFormInstanceController extends BaseController
     @ResponseBody
     public AjaxResult remove(String ids) {
         SysFormDataRecord sysFormDataRecord = new SysFormDataRecord();
-        sysFormDataRecord.setFormIdList(Convert.toStrArray(ids));
+        sysFormDataRecord.setFormIdList(Convert.toStrList(ids));
         List<SysFormDataRecord> sysFormDataRecords = sysFormDataRecordService.selectSysFormDataRecordList(sysFormDataRecord);
         if(CollUtil.isNotEmpty(sysFormDataRecords)){
             return AjaxResult.error("该表单已被填写,暂不能删除");
diff --git a/snow-from/src/main/java/com/snow/from/domain/SysFormDataRecord.java b/snow-from/src/main/java/com/snow/from/domain/SysFormDataRecord.java
index b8d65b4..073594d 100644
--- a/snow-from/src/main/java/com/snow/from/domain/SysFormDataRecord.java
+++ b/snow-from/src/main/java/com/snow/from/domain/SysFormDataRecord.java
@@ -1,10 +1,13 @@
 package com.snow.from.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.snow.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 单数据记录对象 sys_form_data_record
  * 
@@ -31,7 +34,8 @@ public class SysFormDataRecord extends BaseEntity
     /**
      * 表单id数组
      */
-    private String[] formIdList;
+    @TableField(exist = false)
+    private List formIdList;
 
     /**
      * 表单内容
diff --git a/snow-from/src/main/java/com/snow/from/service/impl/SysFormDataRecordServiceImpl.java b/snow-from/src/main/java/com/snow/from/service/impl/SysFormDataRecordServiceImpl.java
index c8f3fbb..ed49968 100644
--- a/snow-from/src/main/java/com/snow/from/service/impl/SysFormDataRecordServiceImpl.java
+++ b/snow-from/src/main/java/com/snow/from/service/impl/SysFormDataRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package com.snow.from.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -68,6 +69,7 @@ public class SysFormDataRecordServiceImpl extends ServiceImpl<SysFormDataRecordM
         lambda.eq(ObjectUtil.isNotEmpty(sysFormDataRecord.getFormId()),SysFormDataRecord::getFormId,sysFormDataRecord.getFormId());
         lambda.eq(ObjectUtil.isNotEmpty(sysFormDataRecord.getFormStatus()),SysFormDataRecord::getFormStatus,sysFormDataRecord.getFormStatus());
         lambda.eq(ObjectUtil.isNotEmpty(sysFormDataRecord.getDingProcessInstanceId()),SysFormDataRecord::getDingProcessInstanceId,sysFormDataRecord.getDingProcessInstanceId());
+        lambda.in(CollUtil.isNotEmpty(sysFormDataRecord.getFormIdList()),SysFormDataRecord::getFormId,sysFormDataRecord.getFormId());
         lambda.orderByDesc(SysFormDataRecord::getCreateTime);
         return sysFormDataRecordMapper.selectList(lambda);
     }