From d323ac1bcf18215d6f96c4db82319be745950fe7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 14:24:53 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 46bae82..7815ece 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("用户不存在！请联系管理员");
@@ -280,7 +280,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 +308,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