From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 fa3d6ca..ce61849 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
@@ -62,7 +62,7 @@
}
//本地表查询用户
- user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
if (user == null) {
//本地没有此用户 新用户
SysUser newSysUser=new SysUser();
@@ -79,7 +79,7 @@
IUserService.insertConfig(newSysUser);
}
- user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
if (user == null) {
return ResultData.error("用户不存在！请联系管理员");
@@ -100,6 +100,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
@@ -125,6 +126,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
@@ -212,7 +214,7 @@
return error("该账户已存在！");
}
- config.setUserType("1");
+ config.setUserType("3");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -241,7 +243,7 @@
return error("账户不能为空");
}
- config.setUserType("1");
+ config.setUserType("3");
return toAjax(IUserService.updateConfig(config));
}
@@ -280,7 +282,7 @@
return error("userId不能为空");
}
- SysUser sysUser=IUserService.selectData(userId);
+ SysUser sysUser=IUserService.selectData(userId,null);
//删除标志（0代表存在 2代表删除）
sysUser.setDelFlag("2");
return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +310,7 @@
return error("密码不能为空");
}
- SysUser sysUser=IUserService.selectData(config.getUserId()+"");
+ SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
if(sysUser==null)
{
return error("用户不存在");
--
Gitblit v1.7.1