From 96573457763a8ca680d727779801c19d8ef3ee98 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 2 Nov 2022 17:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/constant/EventIssueItemState.java | 11 ++++++-----
 .../service/impl/ItemGridPlatformServiceImpl.java     |  2 +-
 .../src/main/resources/mapper/item/ItemDao.xml        |  6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
index 623a396ec..97e8ddfd6 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.constant;
 
 /**
  * 事件、议题、项目状态常量
+ *
  * @Author LC
  * @Date 2019/9/5 9:14
  */
@@ -39,24 +40,24 @@ public interface EventIssueItemState {
     /**
      * 项目-关闭
      */
-    int ITEM_CLOSED= 5;
+    int ITEM_CLOSED = 5;
     /**
      * 项目-结案
      */
-    int ITEM_CLOSEING_CASE= 10;
+    int ITEM_CLOSEING_CASE = 10;
 
     /**
      * 议题处理-审核通过
      */
-    int ISSUE_HANDLED_PASS= 0;
+    int ISSUE_HANDLED_PASS = 0;
     /**
      * 议题处理-反馈
      */
-    int ISSUE_HANDLED_FEEDBACK= 1;
+    int ISSUE_HANDLED_FEEDBACK = 1;
     /**
      * 议题处理-关闭
      */
-    int ISSUE_HANDLED_CLOSED= 2;
+    int ISSUE_HANDLED_CLOSED = 2;
     /**
      * 事件状态字段
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java
index ee51e603a..943521ccc 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemGridPlatformServiceImpl.java
@@ -21,9 +21,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dto.item.ItemGridPlatformDTO;
 import com.elink.esua.epdc.dto.item.result.ActReplyResultDTO;
 import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao;
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index bc86d68db..fcf73bea7 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -2208,6 +2208,9 @@
         <if test="mobile != null and mobile != ''">
             and i.MOBILE = #{mobile}
         </if>
+        <if test="nickName != null and nickName != ''">
+            and i.NICK_NAME = #{nickName}
+        </if>
         <if test="itemContent != null and itemContent != ''">
             and i.ITEM_CONTENT like '%${itemContent}%'
         </if>
@@ -2306,6 +2309,9 @@
         <if test="mobile != null and mobile != ''">
             and i.MOBILE = #{mobile}
         </if>
+        <if test="nickName != null and nickName != ''">
+            and i.NICK_NAME = #{nickName}
+        </if>
         <if test="itemContent != null and itemContent != ''">
             and i.ITEM_CONTENT like '%${itemContent}%'
         </if>