Merge branch 'dev' into pre-production

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,

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);