XMLWAN vor 4 Jahren
Ursprung
Commit
b4437afca9
2 geänderte Dateien mit 13 neuen und 1 gelöschten Zeilen
  1. 7 1
      controllers/gobal_config_api_controller.go
  2. 6 0
      service/home_service.go

+ 7 - 1
controllers/gobal_config_api_controller.go Datei anzeigen

@@ -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
 }

+ 6 - 0
service/home_service.go Datei anzeigen

@@ -14,6 +14,12 @@ func GetHomeData(adminUserId int64) (adminUser models.VMAdminUser, err error) {
14 14
 	return
15 15
 }
16 16
 
17
+func GetCreator(id int64, orgid int64) (models.SgjUserAdminRole, error) {
18
+	role := models.SgjUserAdminRole{}
19
+	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status =1", id, orgid).Find(&role).Error
20
+	return role, err
21
+}
22
+
17 23
 func GetAllApp(org_id int64) (apps []*models.OrgApp, err error) {
18 24
 	err = readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND pid > 0 AND org_id = ?", org_id).Order("number asc").Find(&apps).Error
19 25
 	return