From 55eb68a64a8ece9b1beaf63d477bf1a976d9ce5c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:53:09 +0800
Subject: [PATCH] 修改bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 1fba376..4e38b2e 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,16 +95,26 @@
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());
+ user.setDepartmentId(config.getDepartmentId());
+ user.setUserName(config.getUserName());
+ user.setPhonenumber(config.getPhonenumber());
+ user.setLoginName(config.getLoginName());
+ user.setMasterIds(config.getMasterIds());
+ user.setRoleIds(2+"");
+ user.setUserType("2");
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
- return ResultData.error("该手机号已注册账户！请更换");
+ return toAjax(IUserService.updateConfig(user));
}
config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
- config.setUserId(Snowflake.getId());
+ config.setUserId(Snowflake.getId()+"");
return toAjax(IUserService.insertConfig(config));
}
@@ -209,8 +219,7 @@
@ApiOperation(" 查询导办用户列表（不分页）")
@GetMapping("/queryList")
@Authorization
- public ResultData queryList(){
- return ResultData.success(IUserService.queryList(2));
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
}
-
}
--
Gitblit v1.7.1