|
|
@@ -322,16 +322,19 @@ func (c *ProjectSettingApi) GetProject() {
|
|
|
c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
|
|
|
return
|
|
|
}
|
|
|
- data, err := c.ServiceProject.Get(projectId)
|
|
|
- userId, _ := utils.GetDecryptId(data.UserId)
|
|
|
+ projectdata, err := c.ServiceProject.Get(projectId)
|
|
|
+ userId, _ := utils.GetDecryptId(projectdata.UserId)
|
|
|
accountData := c.ServiceProjectAccount.Get(userId, projectId)
|
|
|
|
|
|
- // data, err := c.ServiceProjectAccount.GetProjectInfo(projectId)
|
|
|
+ data := make(map[string]interface{})
|
|
|
+ data["project"] = projectdata
|
|
|
+ data["account"] = accountData
|
|
|
+
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
|
|
|
return
|
|
|
} else {
|
|
|
- c.Ctx.JSON(iris.Map{"code": 0, "msg": "操作成功", "project": data, "account": accountData})
|
|
|
+ c.Ctx.JSON(iris.Map{"code": 0, "msg": "操作成功", "data": data})
|
|
|
}
|
|
|
}
|
|
|
|
