|
@@ -124,10 +124,10 @@ public class SysUserController extends BaseController {
|
|
@PostMapping("/getUsersItemByDeptId")
|
|
@PostMapping("/getUsersItemByDeptId")
|
|
public TableDataInfo getUsersItemByDeptId(@RequestBody Map<String, Object> data) {
|
|
public TableDataInfo getUsersItemByDeptId(@RequestBody Map<String, Object> data) {
|
|
startPage();
|
|
startPage();
|
|
- Long deptId = Long.parseLong(data.get("deptId").toString());
|
|
|
|
|
|
+// Long deptId = Long.parseLong(data.get("deptId").toString());
|
|
String userName = data.get("userName").toString();
|
|
String userName = data.get("userName").toString();
|
|
String nickName = data.get("nickName").toString();
|
|
String nickName = data.get("nickName").toString();
|
|
- List<SysUser> list = userService.selectUserItemByDeptId(deptId, userName, nickName);
|
|
|
|
|
|
+ List<SysUser> list = userService.selectUserItemByDeptId( userName, nickName);
|
|
List<SysUser> distinct = list.stream().distinct().collect(Collectors.toList());
|
|
List<SysUser> distinct = list.stream().distinct().collect(Collectors.toList());
|
|
return getDataTable(distinct);
|
|
return getDataTable(distinct);
|
|
}
|
|
}
|