From 01b70437d4ef3348e69b2af0dcbd7250e1234117 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 十一月 2022 13:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 764bbb4..5266576 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -59,7 +59,7 @@
List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
HuaChengSysUser huaChengSysUser=null;
- if(list!=null || list.size()>0 )
+ if(list!=null && list.size()>0 )
{
huaChengSysUser=list.get(0);
}
@@ -113,6 +113,7 @@
map.put("userType", user.getUserType());
map.put("departmentId", user.getDepartmentId());
map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
return ResultData.success(map);
}
@@ -148,6 +149,7 @@
map.put("userType", user.getUserType());
map.put("departmentId", user.getDepartmentId());
map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
return ResultData.success(map);
}
@@ -195,9 +197,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,"3",keyword,null);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum(null,keyword,null,"1");
return getDataTable(list,num);
}
@@ -307,8 +309,6 @@
return error("账户不能为空");
}
- config.setUserType("3");
-
config.setUpdateBy(sys.getUserId()+"");
return toAjax(IUserService.updateConfig(config));
@@ -396,7 +396,7 @@
*
* @return 结果
*/
- @ApiOperation("获取登录人员信息")
+ @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员 isDivisionHead=1 为部门领导",response = SysUser.class)
@PostMapping("/getLoginInformation")
@Authorization
public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
@@ -407,5 +407,15 @@
+ @ApiOperation("切换部门接口")
+ @GetMapping(value = "/switch/department")
+ public ResultData switchDepartment(@RequestParam(value = "departmentId",required = false) String departmentId,
+ @CurrentUser SysUser sysUse)
+ {
+ sysUse.setDepartmentId(departmentId);
+ return toAjax(IUserService.updateConfig(sysUse));
+ }
+
+
}
--
Gitblit v1.7.1