From 2467978ddf7cbd4624e5d2515ffe3c089dbfd310 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 02:45:29 +0800
Subject: [PATCH] 备注导出日期修改为没有时分秒格式，员工信息增加入离职类型的导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 8396ad8..49f7e84 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -239,10 +239,10 @@
list.forEach(p -> {
//仲裁类型
p.setArbitrationTypeName(dicItems.stream()
- .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
+ .filter(k -> DicCode.ZCTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("劳资纠纷"));
+ .orElse(""));
});
return list;
--
Gitblit v1.8.0