From 926df9e9365ddf60a5704fa198c07c1b73feb0e9 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 16:08:53 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 47af669..5eb13b5 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
@@ -98,8 +98,15 @@
SysUser user=IUserService.selectData(null,config.getPhonenumber());
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 toAjax(IUserService.updateConfig(user));
@@ -107,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));
}
@@ -212,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