From de09486be84c639bc8480b618e37aec1119e34ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 20 Sep 2023 17:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java     |  8 ++++++++
 .../components/ParameterItemCollectionList.vue       | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index dc7be6228..cf0973a09 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -697,6 +697,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             sqlJoinSb.append(" and dre like '%").append(paramsCollectManifestVO.getDre()).append("%'");
         }
 
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getState())) {
+            paramsCollectManifestVO.setDre(paramsCollectManifestVO.getState().replaceAll("'", "\'"));
+            sqlJoinSb.append(" and state = '").append(paramsCollectManifestVO.getDre()).append("'");
+        }
+        if (StringUtils.isNotEmpty(paramsCollectManifestVO.getCertCategory())) {
+            sqlJoinSb.append(" and cert_category like '%").append(paramsCollectManifestVO.getCertCategory()).append("%'");
+        }
+
         // 如果高级查询条件不为空，拼接参数
         if (StringUtils.isNotEmpty(paramsCollectManifestVO.getQueryConditionVOListStr())) {
             List<QueryConditionVO> queryConditionVOList = JSONObject.parseArray(paramsCollectManifestVO.getQueryConditionVOListStr(), QueryConditionVO.class);
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 66dffac05..13d24b0b4 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -799,12 +799,12 @@
             value: 'paramsNumber',
             text: this.$t('certificationCategoryNumber')
           },
-          // {
-          //   type: '',
-          //   value: 'state',
-          //   text: this.$t('status'),
-          //   options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
-          // },
+          {
+            type: '',
+            value: 'state',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
           {
             type: 'string',
             value: 'params_batch',