From dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33 Mon Sep 17 00:00:00 2001
From: xjj <xjj@123>
Date: 星期二, 27 二月 2024 13:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
index ece2a14..3d049f6 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
@@ -42,6 +42,7 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(User::getHostId, param.get("host_id"));
wrapper.orderByDesc(User::getId);
if (9527 == getUserId()) {
return R.ok(userService.page(new Page<>(curr, limit), wrapper));
@@ -84,6 +85,10 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ User one = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUsername, user.getUsername()));
+ if (one != null) {
+ return R.error("璐﹀彿宸插瓨鍦�");
+ }
user.setStatus(1);
user.setCreateTime(new Date());
userService.save(user);
--
Gitblit v1.9.1