|
|
@@ -4281,7 +4281,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
|
|
|
systemAdminMap[v.AdminId] = v
|
|
|
departmentMap[v.DepartmentName] = v.DepartmentName
|
|
|
departmentAdminMap[v.AdminId] = v.DepartmentName
|
|
|
- groupMap[v.GroupName] = v.DepartmentName
|
|
|
+ groupMap[v.GroupName+v.DepartmentName] = v.DepartmentName
|
|
|
}
|
|
|
|
|
|
depList := make([]company.DepartmentGroupAdmins, 0)
|
|
|
@@ -4301,7 +4301,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
|
|
|
if v1 == depList[k].RealName && v1 != "" {
|
|
|
item := &company.DepartmentGroupAdmins{
|
|
|
AdminId: "group_" + strconv.Itoa(k),
|
|
|
- RealName: k1,
|
|
|
+ RealName: strings.Replace(k1,v1,"",-1),
|
|
|
}
|
|
|
depList[k].ChildrenList = append(depList[k].ChildrenList, item)
|
|
|
}
|
|
|
@@ -4311,7 +4311,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
|
|
|
for _, admin := range systemAdminList {
|
|
|
for i, v := range depList {
|
|
|
for k, group := range v.ChildrenList {
|
|
|
- if admin.GroupName == group.RealName {
|
|
|
+ if admin.GroupName == group.RealName && admin.DepartmentName == v.RealName {
|
|
|
item := &company.DepartmentGroupAdmins{
|
|
|
AdminId: strconv.Itoa(admin.AdminId),
|
|
|
RealName: admin.RealName,
|
ziwen