|
@@ -947,8 +947,12 @@ func (c *GobalConfigApiController) GetPrintInfo() {
|
947
|
947
|
|
948
|
948
|
func (c *GobalConfigApiController) GetOrgs() {
|
949
|
949
|
adminUserInfo := c.GetAdminUserInfo()
|
|
950
|
+ //获取当前人姓名
|
|
951
|
+ var id = adminUserInfo.AdminUser.Id
|
|
952
|
+ orgId := adminUserInfo.CurrentOrgId
|
950
|
953
|
var orgs []*models.Org
|
951
|
954
|
adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
|
|
955
|
+ creator, err := service.GetCreator(id, orgId)
|
952
|
956
|
if err != nil {
|
953
|
957
|
c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
954
|
958
|
return
|
|
@@ -964,7 +968,9 @@ func (c *GobalConfigApiController) GetOrgs() {
|
964
|
968
|
orgs = RemoveRepeatedOrgElement(orgs)
|
965
|
969
|
|
966
|
970
|
c.ServeSuccessJSON(map[string]interface{}{
|
967
|
|
- "orgs": orgs,
|
|
971
|
+ "orgs": orgs,
|
|
972
|
+ "adminUser": adminUser,
|
|
973
|
+ "creator": creator,
|
968
|
974
|
})
|
969
|
975
|
|
970
|
976
|
}
|