From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 b8bdf86..bce667a 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
@@ -19,6 +19,7 @@
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.SinataUtil;
+import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.service.impl.TOperatorUserServiceImpl;
@@ -221,7 +222,7 @@
*/
@ResponseBody
@RequestMapping(value = "/addOperator")
- public ResultUtil addOperator(String name,String userName,String phone,Integer type ,@RequestParam String comArr) {
+ 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("当前管理员名称和电话已存在!");
@@ -230,6 +231,12 @@
user.setName(userName);
user.setPhone(phone);
user.setObjectType(2);
+ String s = MD5.md5("a123456");
+ user.setPassword(s);
+ user.setAccount(phone);
+ user.setRoleid("2");
+ user.setObjectType(2);
+ userService.save(user);
TOperator data = new TOperator();
data.setUserId(user.getId());
data.setName(name);
@@ -238,7 +245,7 @@
data.setState(1);
operatorService.save(data);
user.setObjectId(data.getId());
- userService.save(user);
+ userService.updateById(user);
if (SinataUtil.isNotEmpty(comArr)){
JSONArray jsonArray = JSON.parseArray(comArr);
int size = jsonArray.size();
--
Gitblit v1.7.1