From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 02d824b..5f4a90b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -12,7 +12,9 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
import com.ruoyi.system.api.domain.poji.sys.SysDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
@@ -32,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -278,6 +281,9 @@
{
return error("当前用户不能删除");
}
+ if(Arrays.stream(userIds).anyMatch((element->element.equals(1L)))){
+ throw new ServiceException("禁止删除admin");
+ }
return toAjax(userService.deleteUserByIds(userIds));
}
@@ -416,13 +422,16 @@
* @description 冻结用户
* @author jqs
* @date 2023/6/29 17:20
- * @param userId
+ * @param mgtFrozenMemberDto
* @return R<Activeness>
*/
@PostMapping("/frozenUser")
- public R frozenUser(@RequestBody Long userId)
+ public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto)
{
- userService.frozenUser(userId);
+ if(mgtFrozenMemberDto.getId()==1){
+ throw new ServiceException("禁止删除admin");
+ }
+ userService.frozenUser(mgtFrozenMemberDto);
return R.ok();
}
@@ -438,6 +447,9 @@
{
String mobile = qwUserDetail.getMobile();
SysStaff sysStaff = sysStaffService.getByMobile(mobile);
+ if(sysStaff==null){
+ throw new ServiceException(AppErrorConstant.USER_NO_SYSTEM);
+ }
Long userId = sysStaff.getUserId();
SysUser sysUser = userService.selectUserById(userId);
Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
--
Gitblit v1.7.1