权限与导出

yz

2021-03-04 6343cac51e460280c721c9db0238b62389146590

权限与导出

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java

@@ -284,6 +284,12 @@
        }
    }

    public static String getUserId(){
        return Optional.ofNullable(getCurrentUser())
                .map(u -> u.getUserId().toString())
                .orElse("1");
    }

    /**
     * 获取当前用户名称
     *

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java

@@ -150,6 +150,7 @@
    @ExcelField(value = "员工编号")
    @TableField(exist = false)
    private String empNumb="";

    @ExcelField(value = "身份证号码")
    @TableField(exist = false)
    private String certificateNumb="";

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml

@@ -2,6 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper">
    <select id="selectPageVo" resultType="java.util.Map">
        select a.*,b.empNumb,b.certificateNumb,  (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as newDeptName,a.newJobName from t_emp_dimissionlog a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
        select a.*,b.empNumb,b.certificateNumb,,b.empName  (select dept_Name from t_dept as dept where dept.dept_Id= b.deptId) as newDeptName,b.jobName as newJobName from t_emp_dimissionlog a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
    </select>
</mapper>

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

@@ -11,6 +11,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -178,14 +179,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpAccidentCases(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpAccidentCases empAccidentcases=new EmpAccidentCases();
            empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empAccidentcases.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empAccidentcases.setDeptName(list.get(1).toString());
            empAccidentcases.setDeptId(deptId);
            empAccidentcases.setDeptId(dept.getDeptId());
            empAccidentcases.setJobName(list.get(2).toString());
            empAccidentcases.setEmpName(list.get(3).toString());
            empAccidentcases.setCertificateNumb(list.get(4).toString());

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

@@ -10,6 +10,7 @@
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -154,14 +155,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpBadRecord empBadrecord=new EmpBadRecord();
            empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empBadrecord.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empBadrecord.setDeptName(list.get(1).toString());
            empBadrecord.setDeptId(deptId);
            empBadrecord.setDeptId(dept.getDeptId());
            empBadrecord.setJobName(list.get(2).toString());
            empBadrecord.setEmpName(list.get(3).toString());
            empBadrecord.setCertificateNumb(list.get(4).toString());

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

@@ -7,6 +7,7 @@
import java.util.*;
import java.util.function.Consumer;

import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.MyUtil;
@@ -894,7 +895,7 @@
                }
            });
        }
        queryWrapper.in("c.deptId", remoteDeptService.userRightDepts());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return queryWrapper;
    }


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

@@ -11,6 +11,7 @@
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -162,14 +163,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpContractInfo contractInfo = new EmpContractInfo();
            contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            contractInfo.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            contractInfo.setDeptName(list.get(1).toString());
            contractInfo.setDeptId(deptId);
            contractInfo.setDeptId(dept.getDeptId());
            contractInfo.setJobName(list.get(2).toString());
            contractInfo.setEmpName(list.get(3).toString());
            contractInfo.setCertificateNumb(list.get(4).toString());

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

@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -142,14 +143,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpDimissionAttend(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
            dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            dimissionAttend.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            dimissionAttend.setDeptName(list.get(1).toString());
            dimissionAttend.setDeptId(deptId);
            dimissionAttend.setDeptId(dept.getDeptId());
            dimissionAttend.setJobName(list.get(2).toString());
            dimissionAttend.setEmpName(list.get(3).toString());
            dimissionAttend.setCertificateNumb(list.get(4).toString());

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

@@ -6,6 +6,7 @@
import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,17 +43,17 @@

    @Override
    public IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
        LambdaQueryWrapper<EmpDimissionLog> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpDimissionLog::getDelFlag, 0);
        QueryWrapper<EmpDimissionLog> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.delFlag", 0);

        if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
            queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0],  empDimissionlog.getEntryDateStr().split(",")[1]);
            queryWrapper.between("a.entryDate", empDimissionlog.getEntryDateStr().split(",")[0],  empDimissionlog.getEntryDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empDimissionlog.getDimissionDateStr())) {
            queryWrapper.between(EmpDimissionLog::getDimissionDate, empDimissionlog.getDimissionDateStr().split(",")[0],  empDimissionlog.getDimissionDateStr().split(",")[1]);
            queryWrapper.between("a.dimissionDate", empDimissionlog.getDimissionDateStr().split(",")[0],  empDimissionlog.getDimissionDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
            queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
            queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());
        }
        Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());


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

@@ -11,6 +11,7 @@
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -160,14 +161,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpInsurance(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpInsurance empInsurance = new EmpInsurance();
            empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empInsurance.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empInsurance.setDeptName(list.get(1).toString());
            empInsurance.setDeptId(deptId);
            empInsurance.setDeptId(dept.getDeptId());
            empInsurance.setJobName(list.get(2).toString());
            empInsurance.setEmpName(list.get(3).toString());
            empInsurance.setCertificateNumb(list.get(4).toString());

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

@@ -11,6 +11,7 @@
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -171,14 +172,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
            empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empLabortrouble.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empLabortrouble.setDeptName(list.get(1).toString());
            empLabortrouble.setDeptId(deptId);
            empLabortrouble.setDeptId(dept.getDeptId());
            empLabortrouble.setJobName(list.get(2).toString());
            empLabortrouble.setEmpName(list.get(3).toString());
            empLabortrouble.setCertificateNumb(list.get(4).toString());

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

@@ -13,6 +13,7 @@
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -139,14 +140,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
            leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            leaveInfo.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            leaveInfo.setDeptName(list.get(1).toString());
            leaveInfo.setDeptId(deptId);
            leaveInfo.setDeptId(dept.getDeptId());
            leaveInfo.setJobName(list.get(2).toString());
            leaveInfo.setEmpName(list.get(3).toString());
            leaveInfo.setCertificateNumb(list.get(4).toString());

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

@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Optional;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -160,14 +161,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpOccupational(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpOccupational empOccupational=new EmpOccupational();
            empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empOccupational.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empOccupational.setDeptName(list.get(1).toString());
            empOccupational.setDeptId(deptId);
            empOccupational.setDeptId(dept.getDeptId());
            empOccupational.setJobName(list.get(2).toString());
            empOccupational.setEmpName(list.get(3).toString());
            empOccupational.setCertificateNumb(list.get(4).toString());

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

@@ -12,6 +12,7 @@
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -169,14 +170,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpPhysicalExam physicalExam = new EmpPhysicalExam();
            physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            physicalExam.setEmpNumb(list.get(0).toString());
            physicalExam.setDeptName(list.get(1).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            physicalExam.setDeptId(deptId);
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            physicalExam.setDeptId(dept.getDeptId());
            physicalExam.setJobName(list.get(2).toString());
            physicalExam.setEmpName(list.get(3).toString());
            physicalExam.setCertificateNumb(list.get(4).toString());

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

@@ -8,6 +8,7 @@
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -137,14 +138,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
            empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empRemarkinfo.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empRemarkinfo.setDeptName(list.get(1).toString());
            empRemarkinfo.setDeptId(deptId);
            empRemarkinfo.setDeptId(dept.getDeptId());
            empRemarkinfo.setJobName(list.get(2).toString());
            empRemarkinfo.setEmpName(list.get(3).toString());
            empRemarkinfo.setCertificateNumb(list.get(4).toString());

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

@@ -11,6 +11,7 @@
import cc.mrbird.febs.server.hr.service.IEmpResignService;
import cn.hutool.core.date.DateUtil;

import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -154,14 +155,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpResign(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpResign resign = new EmpResign();
            resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            resign.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            resign.setDeptName(list.get(1).toString());
            resign.setDeptId(deptId);
            resign.setDeptId(dept.getDeptId());
            resign.setJobName(list.get(2).toString());
            resign.setEmpName(list.get(3).toString());
            resign.setCertificateNumb(list.get(4).toString());

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

@@ -9,6 +9,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -158,14 +159,20 @@
    @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject,List<String>  returnList) {
        for (List<Object> list : listObject) {
            if (list.size()==0){
                continue;
            }
            EmpUnemployment empUnemployment=new EmpUnemployment();
            empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empUnemployment.setEmpNumb(list.get(0).toString());
            List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
                    .getDeptId();
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
                continue;
            }
            empUnemployment.setDeptName(list.get(1).toString());
            empUnemployment.setDeptId(deptId);
            empUnemployment.setDeptId(dept.getDeptId());
            empUnemployment.setJobName(list.get(2).toString());
            empUnemployment.setEmpName(list.get(3).toString());
            empUnemployment.setCertificateNumb(list.get(4).toString());

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java

@@ -86,8 +86,7 @@
    
    @GetMapping("userRightDepts")
    public String userRightDepts(){
      log.info("当前用户Id"+operatorId);
      String userRightDepts=userDataPermissionService.findByUserId(operatorId);
      String userRightDepts=userDataPermissionService.findByUserId(FebsUtil.getUserId());
      log.info("当前用户权限"+userRightDepts);
      return userRightDepts;
    }