From 533d26dae76cb5e54e84d6105f7aee42dcb9f76b Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:15:25 +0800
Subject: [PATCH] 接入微信支付
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 14 +++++++++++---
1 files changed, 11 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 7f65a81..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
@@ -14,6 +14,7 @@
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;
@@ -33,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;
@@ -279,6 +281,9 @@
{
return error("当前用户不能删除");
}
+ if(Arrays.stream(userIds).anyMatch((element->element.equals(1L)))){
+ throw new ServiceException("禁止删除admin");
+ }
return toAjax(userService.deleteUserByIds(userIds));
}
@@ -417,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();
}
--
Gitblit v1.7.1