From c1492b5f29a0480a75cf156b09cdde34afb8ebe5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 17:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 c1d7e8e..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,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());
@@ -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));
}
@@ -219,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