Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/gobal_config_api_controller.go

@@ -946,8 +946,12 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 
 func (c *GobalConfigApiController) GetOrgs() {
 	adminUserInfo := c.GetAdminUserInfo()
+	//获取当前人姓名
+	var id = adminUserInfo.AdminUser.Id
+	orgId := adminUserInfo.CurrentOrgId
 	var orgs []*models.Org
 	adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
+	creator, err := service.GetCreator(id, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -963,7 +967,9 @@ func (c *GobalConfigApiController) GetOrgs() {
 	orgs = RemoveRepeatedOrgElement(orgs)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"orgs": orgs,
+		"orgs":      orgs,
+		"adminUser": adminUser,
+		"creator":   creator,
 	})
 
 }

service/home_service.go

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