From a7009a57d79d86ddd868d34b1b040ab0af1e6ab9 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 27 Aug 2024 21:39:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml | 2 +-
 .../supervise/service/impl/IndicatorsServiceImpl.java    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index e956ea312..5a86b1d84 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -113,7 +113,7 @@
         sc.name classifyName,
         sc.description classifyDesc,
         si.remark indicatorsRemark,
-        sc.examine_dept_id examineDeptId,
+        sc.create_dept examineDeptId,
         sc.examine_dept_name examineDeptName,
         psc.name parentClassifyName,
         psc.description parentClassifyDesc,
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
index a8562510e..843a2b373 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
@@ -17,6 +17,7 @@ import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDeptClient;
 import org.springblade.system.feign.IUserClient;
@@ -173,13 +174,17 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 		String endDateStr = indicatorsDTO.getEndDateStr();
 		String createDeptName = indicatorsDTO.getCreateDeptName();
 
-		Long createDept = deptClient.findIdByName(createDeptName);
+		if(StringUtil.isNotBlank(createDeptName)){
+			Long createDept = deptClient.findIdByName(createDeptName);
+			indicatorsDTO.setCreateDept(createDept);
+		}
+
 
 		Date start = CommonUtil.getStartByDateStr(startDateStr);
 		Date end = CommonUtil.getEndByDateStr(endDateStr);
 		indicatorsDTO.setStart(start);
 		indicatorsDTO.setEnd(end);
-		indicatorsDTO.setCreateDept(createDept);
+
 
 		List<ExportIndicatorsVO> list = baseMapper.selectExportList(indicatorsDTO);