yijiusmile
2021-03-17 2467978ddf7cbd4624e5d2515ffe3c089dbfd310
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -182,7 +182,7 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
         if (list.size()==0){
         if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
            continue;
         }
         EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
@@ -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;