From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 27ac5e0..5bb8b99 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
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.dto.MgtStaffEditDto;
@@ -61,9 +64,9 @@
SysUser sysUser = sysUserService.selectUserById(userId);
String dataScope = sysUser.getDataScope();
List<MgtDeptStaffListVo> deptStaffListVoList;
- if(dataScope.equals("4")){
+ if(dataScope!=null&&dataScope.equals("4")){
deptStaffListVoList = sysStaffMapper.listMgtDeptStaffByDept(sysUser.getDeptId(),null);
- }else if(dataScope.equals("5")){
+ }else if(dataScope!=null&&dataScope.equals("5")){
deptStaffListVoList = sysStaffMapper.listMgtDeptStaffByDept(sysUser.getDeptId(),sysUser.getUserId());
}else{
deptStaffListVoList = sysStaffMapper.listMgtDeptStaff();
@@ -98,7 +101,17 @@
public void mgtStaffEdit(MgtStaffEditDto mgtStaffEditDto){
SysStaff sysStaff;
SysUser sysUser;
+ LambdaQueryWrapper<SysStaff> queryWrapper = new LambdaQueryWrapper();
+ queryWrapper.eq(SysStaff::getDelFlag,0);
+ queryWrapper.eq(SysStaff::getStaffMobile,mgtStaffEditDto.getStaffMobile());
+ SysStaff sysStaffSame = this.getOne(queryWrapper, false);
+ if(StringUtils.isBlank(mgtStaffEditDto.getStaffAvatar())){
+ mgtStaffEditDto.setStaffAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ }
if(mgtStaffEditDto.getSysUserId()!=null){
+ if(sysStaffSame!=null&&!sysStaffSame.getUserId().equals(mgtStaffEditDto.getSysUserId())){
+ throw new ServiceException(AppErrorConstant.STAFF_MOBILE_DOUBLE);
+ }
sysStaff = this.getByUserId(mgtStaffEditDto.getSysUserId());
sysUser = sysUserService.selectUserById(mgtStaffEditDto.getSysUserId());
sysUser.setUserName(mgtStaffEditDto.getStaffMobile());
@@ -108,6 +121,9 @@
sysUser.setEmail(mgtStaffEditDto.getStaffEmail());
sysUserService.updateOnlyUser(sysUser);
}else{
+ if(sysStaffSame!=null){
+ throw new ServiceException(AppErrorConstant.STAFF_MOBILE_DOUBLE);
+ }
sysStaff = new SysStaff();
String staffId = IdUtils.simpleUUID();
sysStaff.setStaffId(staffId);
--
Gitblit v1.7.1