From 6588756cf95e8295a93a2826137322b2e7fc6e80 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:27:47 +0800
Subject: [PATCH] 修改【角色管理】无法搜索 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 db3cc08..31e38aa 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
@@ -47,9 +47,9 @@
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",null);
- int num=IUserService.selectNum("2");
+ int num=IUserService.selectNum("2",null);
return getDataTable(list,num);
}
@@ -87,13 +87,20 @@
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
config.setUserType("2");
+
+ SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ if (user != null)
+ {
+ config.setId(user.getId());
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(config));
+ }
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -190,7 +197,8 @@
@GetMapping("/selectListByDepartmentId")
@Authorization
public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
- @RequestParam(value = "classifyId",required = false) String classifyId){
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
}
--
Gitblit v1.7.1