From cfd0118ef446a66f91999afc7b1e46ca607adf50 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 13 七月 2023 20:32:35 +0800
Subject: [PATCH] 定时任务 统计
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysStaffServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 c82f9cc..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;
@@ -58,12 +61,12 @@
*/
@Override
public List<MgtDeptStaffListVo>listMgtDeptStaffByPermission(Long userId){
- SysUser sysUser = sysUserService.getById(userId);
+ 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,16 +101,29 @@
public void mgtStaffEdit(MgtStaffEditDto mgtStaffEditDto){
SysStaff sysStaff;
SysUser sysUser;
- if(mgtStaffEditDto.getUserId()!=null){
- sysStaff = this.getByUserId(mgtStaffEditDto.getUserId());
- sysUser = sysUserService.getById(mgtStaffEditDto.getUserId());
+ 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());
sysUser.setPhonenumber(mgtStaffEditDto.getStaffMobile());
sysUser.setNickName(mgtStaffEditDto.getStaffName());
sysUser.setAvatar(mgtStaffEditDto.getStaffAvatar());
sysUser.setEmail(mgtStaffEditDto.getStaffEmail());
- sysUserService.saveOrUpdate(sysUser);
+ 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