|
|
@@ -16,5 +16,19 @@ func ShowRelatedSoftwares(c *gin.Context) {
|
|
|
" WHERE task.plan_id = plan.id and plan.software_id = software.id and "+
|
|
|
"task.executor_id = ? and task.`delete` <> 1 and software.`delete` <> 1 order by software.`create_time` desc", userId).Find(&softwares)
|
|
|
|
|
|
- response.Success(c, gin.H{"softwares": softwares}, "success")
|
|
|
+ type result struct {
|
|
|
+ model.Software
|
|
|
+ CompanyName string `json:"company_name"`
|
|
|
+ }
|
|
|
+
|
|
|
+ res := make([]result, len(softwares))
|
|
|
+ for i, v := range softwares {
|
|
|
+ var company model.Company
|
|
|
+ if v.CompanyId != 0 {
|
|
|
+ db.Model(model.Company{}).Where("id = ?", v.CompanyId).First(&company)
|
|
|
+ }
|
|
|
+ res[i].Software = v
|
|
|
+ res[i].CompanyName = company.Name
|
|
|
+ }
|
|
|
+ response.Success(c, gin.H{"softwares": res}, "success")
|
|
|
}
|
