From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 7128a75..ff8f6f1 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -64,7 +64,7 @@
}
//本地表查询用户
- user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
if (user == null) {
//本地没有此用户 新用户
SysUser newSysUser=new SysUser();
@@ -81,7 +81,7 @@
IUserService.insertConfig(newSysUser);
}
- user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
if (user == null) {
return ResultData.error("用户不存在！请联系管理员");
@@ -103,6 +103,9 @@
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
return ResultData.success(map);
}
@@ -129,6 +132,9 @@
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
return ResultData.success(map);
}
@@ -216,15 +222,21 @@
return error("手机号不能为空");
}
- SysUser user = IUserService.selectData("",config.getPhonenumber());
+ SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
+ SysUser user2 = IUserService.selectData("","",config.getLoginName());
if (user != null) {
//提示用户名或密码错误
- return error("该账户已存在！");
+ return error("该用户已存在！");
}
+ if(user2 != null)
+ {
+ //提示用户名或密码错误
+ return error("该登录账户已存在！请修改登录账户");
+ }
config.setCreateBy(sysUser.getUserId()+"");
- config.setUserId(Snowflake.getId());
+ config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
config.setCreateTime(LocalDateTime.now());
@@ -295,7 +307,7 @@
return error("userId不能为空");
}
- SysUser sysUser=IUserService.selectData(userId,null);
+ SysUser sysUser=IUserService.selectData(userId,null,null);
//删除标志（0代表存在 2代表删除）
sysUser.setDelFlag("2");
return toAjax(IUserService.updateConfig(sysUser));
@@ -323,7 +335,7 @@
return error("密码不能为空");
}
- SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
+ SysUser sysUser=IUserService.selectData(config.getUserId()+"",null,null);
if(sysUser==null)
{
return error("用户不存在");
--
Gitblit v1.7.1