提交 4a9c83f1 编写于 作者: zhouweidong's avatar zhouweidong

支持ibz与sys双模式

上级 ac53d8c2
......@@ -102,11 +102,11 @@
// 判断是否超级用户
if (user.superuser==1) {
// 获取所有组织的部门及下级组织的部门
url = 'ibzorganizations/alls/suborg/ibzdepartments/picker';
url = 'sysorganizations/alls/suborg/sysdepartments/picker';
}else {
// 获取当前登录人所在组织的部门及下级组织的部门
if (_this.curUserContext && _this.curUserContext.srforgid) {
url = 'ibzorganizations/' + _this.curUserContext.srforgid + '/suborg/ibzdepartments/picker';
url = 'sysorganizations/' + _this.curUserContext.srforgid + '/suborg/sysdepartments/picker';
}else {
this.$Notice.error({title: '错误', desc: '当前登录人组织为空'});
}
......
......@@ -101,10 +101,10 @@
let url = '';
if (user.superuser==1) {
// 获取所有组织
url = 'ibzorganizations/alls/suborg/picker';
url = 'sysorganizations/alls/suborg/picker';
}else {
if (_this.curUserContext && _this.curUserContext.srforgid) {
url = 'ibzorganizations/' + _this.curUserContext.srforgid + '/suborg/picker';
url = 'sysorganizations/' + _this.curUserContext.srforgid + '/suborg/picker';
} else {
this.$Notice.error({title: '错误', desc: '当前登录人组织为空'});
}
......
......@@ -39,7 +39,7 @@ public class OUCoreResource
@Autowired
private ISysDepartmentService iibzDepartmentService;
@GetMapping("/ibzemployees/{userId}/oumaps")
@GetMapping(value={"/ibzemployees/{userId}/oumaps","/sysemployees/{userId}/oumaps"})
public ResponseEntity<Map<String, Set<String>>> getOUMapsByUserId(@PathVariable("userId") String userId)
{
SysEmployee emp=iibzEmployeeService.get(userId);
......@@ -52,7 +52,7 @@ public class OUCoreResource
return ResponseEntity.ok(this.getMaps(orgid,deptid));
}
@GetMapping("/ibzdepartments/{deptId}/emp")
@GetMapping(value={"/ibzdepartments/{deptId}/emp","/sysdepartments/{deptId}/emp"})
public ResponseEntity<Map> getEmpByDept(@PathVariable("deptId") String deptId)
{
Map map=new LinkedHashMap<>();
......@@ -62,7 +62,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzdepartments/{deptId}/fatheremp")
@GetMapping(value={"/ibzdepartments/{deptId}/fatheremp","/sysdepartments/{deptId}/fatheremp"})
public ResponseEntity<Map> getFatherEmpByDept(@PathVariable("deptId") String deptId)
{
Map map=new LinkedHashMap<>();
......@@ -72,7 +72,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzdepartments/{deptId}/parentemp")
@GetMapping(value={"/ibzdepartments/{deptId}/parentemp","/sysdepartments/{deptId}/parentemp"})
public ResponseEntity<Map> getParentEmpByDept(@PathVariable("deptId") String deptId)
{
Map map=new LinkedHashMap<>();
......@@ -82,7 +82,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzdepartments/{deptId}/subemp")
@GetMapping(value={"/ibzdepartments/{deptId}/subemp","/sysdepartments/{deptId}/subemp"})
public ResponseEntity<Map> getSubEmpByDept(@PathVariable("deptId") String deptId)
{
Map map=new LinkedHashMap<>();
......@@ -93,7 +93,7 @@ public class OUCoreResource
}
@GetMapping("/ibzorganizations/{orgId}/emp")
@GetMapping(value={"/ibzorganizations/{orgId}/emp","/sysorganizations/{orgId}/emp"})
public ResponseEntity<Map> getEmpByOrg(@PathVariable("orgId") String orgId)
{
Map map=new LinkedHashMap<>();
......@@ -103,7 +103,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzorganizations/{orgId}/fatheremp")
@GetMapping(value={"/ibzorganizations/{orgId}/fatheremp","/sysorganizations/{orgId}/fatheremp"})
public ResponseEntity<Map> getFatherEmpByOrg(@PathVariable("orgId") String orgId)
{
Map map=new LinkedHashMap<>();
......@@ -113,7 +113,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzorganizations/{orgId}/parentemp")
@GetMapping(value={"/ibzorganizations/{orgId}/parentemp","/sysorganizations/{orgId}/parentemp"})
public ResponseEntity<Map> getParentEmpByOrg(@PathVariable("orgId") String orgId)
{
Map map=new LinkedHashMap<>();
......@@ -123,7 +123,7 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzorganizations/{orgId}/subemp")
@GetMapping(value={"/ibzorganizations/{orgId}/subemp","/sysorganizations/{orgId}/subemp"})
public ResponseEntity<Map> getSubEmpByOrg(@PathVariable("orgId") String orgId)
{
Map map=new LinkedHashMap<>();
......@@ -133,28 +133,28 @@ public class OUCoreResource
return ResponseEntity.ok(map);
}
@GetMapping("/ibzorganizations/picker")
@GetMapping(value={"/ibzorganizations/picker","/sysorganizations/picker"})
public ResponseEntity<List<OrgNode>> getPicker()
{
List<OrgNode> list=ouCoreService.getOrgNode("alls");
return ResponseEntity.ok(list);
}
@GetMapping("/ibzorganizations/{orgId}/ibzdepartments/picker")
@GetMapping(value={"/ibzorganizations/{orgId}/ibzdepartments/picker","/sysorganizations/{orgId}/sysdepartments/picker"})
public ResponseEntity<List<DeptNode>> getOrgDeptPicker(@PathVariable("orgId") String orgId)
{
List<DeptNode> list=ouCoreService.getDeptNode(orgId);
return ResponseEntity.ok(list);
}
@GetMapping("/ibzorganizations/{orgId}/suborg/picker")
@GetMapping(value={"/ibzorganizations/{orgId}/suborg/picker","/sysorganizations/{orgId}/suborg/picker"})
public ResponseEntity<List<OrgNode>> getSubOrgPicker(@PathVariable("orgId") String orgId)
{
List<OrgNode> list=ouCoreService.getOrgNode(orgId);
return ResponseEntity.ok(list);
}
@GetMapping("/ibzorganizations/{orgId}/suborg/ibzdepartments/picker")
@GetMapping(value={"/ibzorganizations/{orgId}/suborg/ibzdepartments/picker","/sysorganizations/{orgId}/suborg/sysdepartments/picker"})
public ResponseEntity<List<DeptNode>> getSubOrgDeptPicker(@PathVariable("orgId") String orgId)
{
List<DeptNode> list=ouCoreService.getOrgDeptNode(orgId);
......@@ -162,7 +162,7 @@ public class OUCoreResource
}
@GetMapping("/ibzorganizations/{orgId}/ibzemployees/picker")
@GetMapping(value={"/ibzorganizations/{orgId}/ibzemployees/picker","/sysorganizations/{orgId}/sysemployees/picker"})
public ResponseEntity<List<EmpNode>> getEmpPicker(@PathVariable("orgId") String orgId)
{
List<EmpNode> list=ouCoreService.getEmpNode(orgId);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册