From e153b340f4371ea7bbeb3009a382837ffd60a4b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 28 八月 2023 18:12:01 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
index 16ea7c2..4a82092 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java
@@ -322,60 +322,67 @@
.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();
@@ -403,7 +410,7 @@
}*/
} 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);
}
--
Gitblit v1.7.1