修改bug

yz_08

2021-03-17 9595e097ecd74bcc35a8ef633c6749f5d3d2b19a

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java

@@ -2,8 +2,10 @@

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
@@ -95,6 +97,7 @@
      }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
@@ -179,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();