From faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 15:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index 35dff86..8136128 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -1344,9 +1344,9 @@
@ResponseBody
@RequestMapping(value = "/addOperator")
public ResultUtil addOperator(String name,String userName,String phone,Integer type , String comArr) {
- User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
- if (one!=null){
- return ResultUtil.error("当前管理员名称和电话已存在!");
+ List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).list();
+ if (!list.isEmpty()){
+ return ResultUtil.error("当前管理员手机号已存在!");
}
User user = new User();
user.setName(userName);
@@ -1434,9 +1434,9 @@
@RequestMapping(value = "/updateOperator")
public ResultUtil updateOperator(Integer id,String name,String userName
,String phone,Integer type ,@RequestParam String comArr) {
- User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
- if (one!=null){
- return ResultUtil.error("当前管理员名称和电话已存在!");
+ List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).ne(User::getId, id).list();
+ if (!list.isEmpty()){
+ return ResultUtil.error("当前管理员手机号已存在!");
}
operatorCityService.remove(new QueryWrapper<TOperatorCity>().eq("operatorId",id));
User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id).
--
Gitblit v1.7.1