From d3b2844621f2ef042e050772c1d80570aba8017a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:22:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 8d421dd..1a383c8 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -95,7 +95,7 @@
config.setUserType("2");
- SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
if (user != null)
{
user.setPassword(config.getPassword());
@@ -104,7 +104,7 @@
user.setPhonenumber(config.getPhonenumber());
user.setLoginName(config.getLoginName());
user.setMasterIds(config.getMasterIds());
- user.setRoleIds(2+"");
+ user.setRoleIds("2");
user.setUserType("2");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
@@ -114,7 +114,7 @@
config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
- config.setUserId(Snowflake.getId());
+ config.setUserId(Snowflake.getId()+"");
return toAjax(IUserService.insertConfig(config));
}
@@ -222,4 +222,5 @@
public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
return ResultData.success(IUserService.queryList(2,keyWord));
}
+
}
--
Gitblit v1.7.1