bug

jiangqs

2023-09-06 1ca4c6c6c7861c07980ad0dcd8d5df4b0219bfdc

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java

@@ -14,17 +14,21 @@
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtShopStaffEditDto;
import com.ruoyi.system.api.domain.poji.sys.SysDept;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.domain.dto.MgtStaffEditDto;
import com.ruoyi.system.domain.dto.MgtStaffPageDto;
import com.ruoyi.system.domain.dto.MgtSysStaffImportDto;
import com.ruoyi.system.domain.pojo.staff.SysStaff;
import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.domain.dto.MgtWxCPStaffDto;
import com.ruoyi.system.domain.vo.DeptSimpleVo;
import com.ruoyi.system.domain.vo.MgtDeptStaffListVo;
import com.ruoyi.system.domain.vo.MgtStaffPageVo;
import com.ruoyi.system.mapper.staff.SysStaffMapper;
import com.ruoyi.system.service.staff.SysStaffService;
import com.ruoyi.system.service.staff.SysWxCpService;
import com.ruoyi.system.service.sys.ISysDeptService;
import com.ruoyi.system.service.sys.ISysUserService;
import com.ruoyi.system.util.QiYeUtils;
import org.springframework.stereotype.Service;
@@ -59,6 +63,12 @@

    @Resource
    private RemoteShopService remoteShopService;

    @Resource
    private SysWxCpService sysWxCpService;

    @Resource
    private ISysDeptService sysDeptService;


    /**
@@ -126,6 +136,7 @@
        queryWrapper.eq(SysStaff::getDelFlag,0);
        queryWrapper.eq(SysStaff::getStaffMobile,mgtStaffEditDto.getStaffMobile());
        SysStaff sysStaffSame = this.getOne(queryWrapper, false);
        SysDept sysDept = sysDeptService.selectDeptById(mgtStaffEditDto.getDeptId());
        if(StringUtils.isBlank(mgtStaffEditDto.getStaffAvatar())){
            mgtStaffEditDto.setStaffAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
        }
@@ -171,12 +182,25 @@
        sysStaff.setHeadFlag(mgtStaffEditDto.getHeadFlag());
        sysStaff.setWxUserId(mgtStaffEditDto.getWxUserId());
        this.saveOrUpdate(sysStaff);
        //同步修改商户员工信息
        MgtShopStaffEditDto mgtShopStaffEditDto = new MgtShopStaffEditDto();
        mgtShopStaffEditDto.setUserId(sysStaff.getUserId());
        mgtShopStaffEditDto.setStaffName(sysStaff.getStaffName());
        mgtShopStaffEditDto.setStaffMobile(sysStaff.getStaffMobile());
        mgtShopStaffEditDto.setStaffAvatar(sysStaff.getStaffAvatar());
        remoteShopService.editMgtShopStaff(mgtShopStaffEditDto);
        //如果wxUserId和wxDeptId不为空 同步到企业微信
        if(mgtStaffEditDto.getWxUserId()!=null&&sysDept.getWxDeptId()!=null){
            MgtWxCPStaffDto mgtWxCPStaffDto = new MgtWxCPStaffDto();
            mgtWxCPStaffDto.setWxDeptId(sysDept.getWxDeptId());
            mgtWxCPStaffDto.setWxUserId(mgtStaffEditDto.getWxUserId());
            mgtWxCPStaffDto.setStaffName(mgtStaffEditDto.getStaffName());
            mgtWxCPStaffDto.setStaffMobile(mgtStaffEditDto.getStaffMobile());
            mgtWxCPStaffDto.setStaffPost(mgtStaffEditDto.getStaffPost());
            mgtWxCPStaffDto.setStaffEmail(mgtStaffEditDto.getStaffEmail());
            mgtWxCPStaffDto.setHeadFlag(mgtStaffEditDto.getHeadFlag());
            sysWxCpService.addWxCpStaff(mgtWxCPStaffDto);
        }
    }

    /**
@@ -322,88 +346,72 @@
                .collect(Collectors.toMap(DeptSimpleVo::getDeptName, Function.identity()));
        for (MgtSysStaffImportDto entity : staffImportDtoList) {
            try {
                department = entity.getDepartment();
                lastIndex = department.indexOf(";");
                department = (lastIndex != -1) ? department.substring(0, lastIndex) : department;
                firstIndex = department.lastIndexOf("/");
                secondIndex = department.lastIndexOf('/', firstIndex - 1);
                thirdIndex = department.lastIndexOf('/', secondIndex - 1);
                departmentFirst = department.substring(firstIndex + 1);
                deptSimpleVo = deptMap.get(departmentFirst);
                if(deptSimpleVo==null){
                    departmentSecond = department.substring(secondIndex + 1, firstIndex);
                    deptSimpleVo = deptMap.get(departmentSecond);
                }
                if(deptSimpleVo==null){
                    departmentThird = department.substring(thirdIndex + 1, secondIndex);
                    deptSimpleVo = deptMap.get(departmentThird);
                }
                if(deptSimpleVo!=null&&StringUtils.isNotBlank(entity.getMobile())){
                    LambdaQueryWrapper<SysStaff> queryWrapper = new LambdaQueryWrapper();
                    queryWrapper.eq(SysStaff::getDelFlag,0);
                    queryWrapper.eq(SysStaff::getStaffMobile,entity.getMobile());
                    SysStaff sysStaffSame = this.getOne(queryWrapper, false);
                    if(sysStaffSame!=null){
                        sysStaffSame.setStaffName(entity.getStaffName());
                        sysStaffSame.setStaffPost(entity.getPost());
                        sysStaffSame.setWxUserId(entity.getUserName());
                        if(StringUtils.isNotBlank(entity.getEmail())){
                            sysStaffSame.setStaffEmail(entity.getEmail());
                        }
                        this.saveOrUpdate(sysStaffSame);
                        sysUser = sysUserService.selectUserById(sysStaffSame.getUserId());
                        sysUser.setDeptId(deptSimpleVo.getDeptId());
                        sysUser.setNickName(entity.getStaffName());
                        if(entity.getGender().equals("男")){
                            sysUser.setSex("0");
                        }else if(entity.getGender().equals("女")){
                            sysUser.setSex("1");
                if(StringUtils.isNotBlank(entity.getMobile())){
                    if(StringUtils.isNotBlank(entity.getUserStatus())&&entity.getUserStatus().equals("禁用")){
                        continue;
                    }
                    department = entity.getDepartment();
                    lastIndex = department.indexOf(";");
                    department = (lastIndex != -1) ? department.substring(0, lastIndex) : department;
                    firstIndex = department.lastIndexOf("/");
                    secondIndex = department.lastIndexOf('/', firstIndex - 1);
                    thirdIndex = department.lastIndexOf('/', secondIndex - 1);
                    departmentFirst = department.substring(firstIndex + 1);
                    deptSimpleVo = deptMap.get(departmentFirst);
                    if(deptSimpleVo==null){
                        departmentSecond = department.substring(secondIndex + 1, firstIndex);
                        deptSimpleVo = deptMap.get(departmentSecond);
                    }
                    if(deptSimpleVo==null){
                        departmentThird = department.substring(thirdIndex + 1, secondIndex);
                        deptSimpleVo = deptMap.get(departmentThird);
                    }
                    if(deptSimpleVo!=null&&StringUtils.isNotBlank(entity.getMobile())){
                        LambdaQueryWrapper<SysStaff> queryWrapper = new LambdaQueryWrapper();
                        queryWrapper.eq(SysStaff::getDelFlag,0);
                        queryWrapper.eq(SysStaff::getStaffMobile,entity.getMobile());
                        SysStaff sysStaffSame = this.getOne(queryWrapper, false);
                        if(sysStaffSame!=null){
                            sysStaffSame.setStaffName(entity.getStaffName());
                            sysStaffSame.setStaffPost(entity.getPost());
                            sysStaffSame.setWxUserId(entity.getUserName());
                            if(StringUtils.isNotBlank(entity.getEmail())){
                                sysStaffSame.setStaffEmail(entity.getEmail());
                            }
                            this.saveOrUpdate(sysStaffSame);
                            sysUser = sysUserService.selectUserById(sysStaffSame.getUserId());
                            sysUser.setDeptId(deptSimpleVo.getDeptId());
                            sysUser.setNickName(entity.getStaffName());
                            if(entity.getGender().equals("男")){
                                sysUser.setSex("0");
                            }else if(entity.getGender().equals("女")){
                                sysUser.setSex("1");
                            }else{
                                sysUser.setSex("2");
                            }
                            if(StringUtils.isNotBlank(entity.getEmail())){
                                sysUser.setEmail(entity.getEmail());
                            }
                            sysUserService.updateOnlyUser(sysUser);
                            successNum = successNum + 1;
                        }else{
                            sysUser.setSex("2");
                            MgtStaffEditDto mgtStaffEditDto = new MgtStaffEditDto();
                            mgtStaffEditDto.setDeptId(deptSimpleVo.getDeptId());
                            mgtStaffEditDto.setStaffName(entity.getStaffName());
                            mgtStaffEditDto.setStaffMobile(entity.getMobile());
                            mgtStaffEditDto.setStaffEmail(entity.getEmail());
                            mgtStaffEditDto.setStaffPost(entity.getPost());
                            mgtStaffEditDto.setStaffAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/2023/8/26/362e964917304255aaa36a874063d198.jpg");
                            mgtStaffEditDto.setHeadFlag("0");
                            mgtStaffEditDto.setWxUserId(entity.getUserName());
                            this.mgtStaffEdit(mgtStaffEditDto);
                            successNum = successNum + 1;
                        }
                        if(StringUtils.isNotBlank(entity.getEmail())){
                            sysUser.setEmail(entity.getEmail());
                        }
                        sysUserService.updateOnlyUser(sysUser);
                    }else{
                        MgtStaffEditDto mgtStaffEditDto = new MgtStaffEditDto();
                        mgtStaffEditDto.setDeptId(deptSimpleVo.getDeptId());
                        mgtStaffEditDto.setStaffName(entity.getStaffName());
                        mgtStaffEditDto.setStaffMobile(entity.getMobile());
                        mgtStaffEditDto.setStaffEmail(entity.getEmail());
                        mgtStaffEditDto.setStaffPost(entity.getPost());
                        mgtStaffEditDto.setStaffAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/2023/8/26/362e964917304255aaa36a874063d198.jpg");
                        mgtStaffEditDto.setHeadFlag("0");
                        mgtStaffEditDto.setWxUserId(entity.getUserName());
                        this.mgtStaffEdit(mgtStaffEditDto);
                    }
                }
                /*tagName = entity.getTagName();
                sysTagSame = null;
                // 验证是否存在这个用户
                queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(SysTag::getDelFlag, 0) // 查询条件：delFlag=0
                        .eq(SysTag::getTagType, tagType) // 查询条件：tagType=mgtTagEditDto的tagType属性
                        .eq(SysTag::getTagName, tagName); // 查询条件：tagName=mgtTagEditDto的tagName属性
                // 执行查询，获取与查询条件匹配的SysTag对象
                sysTagSame = this.getOne(queryWrapper);
                if (sysTagSame == null) {
                    sysTagNew = new SysTag();
                    sysTagNew.setDelFlag(0);
                    sysTagNew.setTagType(tagType);
                    sysTagNew.setTagName(tagName);
                    sysTagNew.setCreateTime(nowTime);
                    sysTagNew.setSynFlag(0);
                    this.save(sysTagNew);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、标签 " + sysTagNew.getTagName() + " 导入成功");
                } else {
                    failureNum++;
                    failureMsg.append("<br/>" + failureNum + "、标签 " + sysTagSame.getTagName() + " 已存在");
                }*/
            } catch (Exception e) {
                failureNum++;
                String msg = "<br/>" + failureNum + "、标签 " + entity.getStaffName() + " 导入失败：";
                String msg = "<br/>" + failureNum + "员工 " + entity.getStaffName() + " 导入失败：";
                failureMsg.append(msg + e.getMessage());
                log.error(msg, e);
            }
@@ -416,4 +424,16 @@
        }
        return successMsg.toString();
    }

    /**
     * @description  通过id获取员工列表
     * @author  jqs
     * @date    2023/9/5 10:02
     * @param userIdList
     * @return  List<SysStaff>
     */
    @Override
    public List<SysStaff> listSysStaffByIds(List<Long> userIdList){
        return sysStaffMapper.listSysStaffByIds(userIdList);
    }
}