提交 0e4fdcb6 authored 作者: 000516's avatar 000516

店内执行人员登录信息验证,部门名称使用部门别名

...@@ -70,7 +70,7 @@ public class APReportQueryController { ...@@ -70,7 +70,7 @@ public class APReportQueryController {
String empNo = loginUser.getUsername(); String empNo = loginUser.getUsername();
Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst(); Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst();
if (first.isPresent()) { if (first.isPresent()) {
String deptName = loginUser.getSysUser().getDept().getDeptName(); String deptName = loginUser.getSysUser().getDept().getDeptNameSale();
salesApRequest.setDeptNames("000889".equals(empNo) ? Arrays.asList(deptName,"北京特区") : Arrays.asList(deptName)); salesApRequest.setDeptNames("000889".equals(empNo) ? Arrays.asList(deptName,"北京特区") : Arrays.asList(deptName));
return; return;
} }
...@@ -95,7 +95,7 @@ public class APReportQueryController { ...@@ -95,7 +95,7 @@ public class APReportQueryController {
// 是区域销售部的人员按部门查询 // 是区域销售部的人员按部门查询
String empNo = loginUser.getUsername(); String empNo = loginUser.getUsername();
String deptName = loginUser.getSysUser().getDept().getDeptName(); String deptName = loginUser.getSysUser().getDept().getDeptNameSale();
salesApRequest.setDeptNames("000889".equals(empNo) ? Arrays.asList(deptName, "北京特区") : Arrays.asList(deptName)); salesApRequest.setDeptNames("000889".equals(empNo) ? Arrays.asList(deptName, "北京特区") : Arrays.asList(deptName));
} }
} }
...@@ -115,7 +115,7 @@ public class ApDisplayQueryController { ...@@ -115,7 +115,7 @@ public class ApDisplayQueryController {
Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst(); Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst();
if (first.isPresent()) { if (first.isPresent()) {
ArrayList<String> deptNames = new ArrayList<>(); ArrayList<String> deptNames = new ArrayList<>();
deptNames.add(loginUser.getSysUser().getDept().getDeptName()); deptNames.add(loginUser.getSysUser().getDept().getDeptNameSale());
if ("000889".equals(empNo)){ if ("000889".equals(empNo)){
deptNames.add("北京特区"); deptNames.add("北京特区");
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论