From 2bb5d47275effc59de3377ce53e9b9cbf07b781a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:05:59 +0800
Subject: [PATCH] 海恒bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index e5342d2..3ce2700 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
import com.ruoyi.system.api.domain.dto.MgtUserIdByDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
@@ -68,6 +69,8 @@
@Resource
protected SysUserMenuMapper userMenuMapper;
+
+
/**
* 根据条件分页查询用户列表
@@ -605,10 +608,6 @@
String editValue = appEditUserDto.getEditValue();
switch (editType){
case 1:
- sysUser.setNickName(editValue);
- sysUser.setUpdateTime(DateUtils.getNowDate());
- sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
- userMapper.updateUser(sysUser);
break;
case 2:
sysUser.setAvatar(editValue);
@@ -623,6 +622,12 @@
userMapper.updateUser(sysUser);
break;
case 4:
+ break;
+ case 5:
+ sysUser.setNickName(editValue);
+ sysUser.setUpdateTime(DateUtils.getNowDate());
+ sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
+ userMapper.updateUser(sysUser);
break;
default:
break;
@@ -668,6 +673,7 @@
public void editUserMenu(UserMenuEditDto userMenuEditDto){
SysUser sysUser = this.selectUserById(userMenuEditDto.getUserId());
sysUser.setDataScope(userMenuEditDto.getDataScope());
+ sysUser.setDataScopeEmployee(userMenuEditDto.getDataScopeEmployee());
userMapper.updateUser(sysUser);
userMenuMapper.deleteUserMenuByUserId(userMenuEditDto.getUserId());
int rows = 1;
@@ -710,13 +716,18 @@
* @description
* @author jqs
* @date 2023/7/5 21:24
- * @param userId
+ * @param mgtFrozenMemberDto
* @return void
*/
@Override
- public void frozenUser(Long userId){
+ public void frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto){
+ Long userId = mgtFrozenMemberDto.getId();
SysUser sysUser = this.selectUserById(userId);
- sysUser.setStatus("1");
+ if(mgtFrozenMemberDto.getFrozenFlag()==1){
+ sysUser.setStatus("1");
+ }else{
+ sysUser.setStatus("0");
+ }
userMapper.updateUser(sysUser);
}
}
--
Gitblit v1.7.1