From 2ef5f23b3bbad0def192426683e1e5cb2fb663d6 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 23 Feb 2024 16:32:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml | 2 +-
 .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
index b79b3bb9d..f13c59a86 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
@@ -37,7 +37,7 @@
             <if test="param.name != null and param.name != ''">
                 and `name` like concat('%',#{param.name},'%')
             </if>
-            <if test="param.createDept != null and param.createDept != ''">
+            <if test="param.createDept != null ">
                 and create_dept = #{param.createDept}
             </if>
             <if test="param.examineDeptName != null and param.examineDeptName != ''">
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index ea4c62994..3a6a2d8f5 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -103,6 +103,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		String name = (String) classify.get("name");
 		String isPid = (String) classify.get("isPid");
 		String createDeptName = (String) classify.get("createDeptName");
+		String examineDeptName = (String) classify.get("examineDeptName");
 
 		ClassifyDTO classifyDTO = new ClassifyDTO();
 		if (StringUtil.isNotBlank(pId)) {
@@ -114,6 +115,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		classifyDTO.setName(name);
 		classifyDTO.setIsPid(Integer.parseInt(isPid));
 		classifyDTO.setCreateDept(createDept);
+		classifyDTO.setExamineDeptName(examineDeptName);
 
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();