作者 唐旭辉

修复bug

@@ -424,9 +424,9 @@ func (c *CompanyController) InitCompany() { @@ -424,9 +424,9 @@ func (c *CompanyController) InitCompany() {
424 return 424 return
425 } 425 }
426 426
427 -// GetCompanyForUCenter 总后台调用  
428 -//@router /ucenter/company/info [post]  
429 -func (c *CompanyController) GetCompanyForUCenter() { 427 +// EditCompanyForUCenter 总后台调用
  428 +//@router /ucenter/company/edit [post]
  429 +func (c *CompanyController) EditCompanyForUCenter() {
430 var msg *protocol.ResponseMessage 430 var msg *protocol.ResponseMessage
431 defer func() { 431 defer func() {
432 c.ResposeJson(msg) 432 c.ResposeJson(msg)
@@ -446,9 +446,9 @@ func (c *CompanyController) GetCompanyForUCenter() { @@ -446,9 +446,9 @@ func (c *CompanyController) GetCompanyForUCenter() {
446 return 446 return
447 } 447 }
448 448
449 -//EditCompanyForUCenter  
450 -//@router /ucenter/company/edit [post]  
451 -func (c *CompanyController) EditCompanyForUCenter() { 449 +//GetCompanyForUCenter
  450 +//@router /ucenter/company/info [post]
  451 +func (c *CompanyController) GetCompanyForUCenter() {
452 var msg *protocol.ResponseMessage 452 var msg *protocol.ResponseMessage
453 defer func() { 453 defer func() {
454 c.ResposeJson(msg) 454 c.ResposeJson(msg)
@@ -41,6 +41,7 @@ type ResponseDepartmentInfo struct { @@ -41,6 +41,7 @@ type ResponseDepartmentInfo struct {
41 CompanyID int64 `json:"company_id"` //公司 41 CompanyID int64 `json:"company_id"` //公司
42 Name string `json:"name"` //部门名字 42 Name string `json:"name"` //部门名字
43 ParantID int64 `json:"parentId"` //父级部门Id 43 ParantID int64 `json:"parentId"` //父级部门Id
  44 + ParentName string `json:"parentName"`
44 Manages []DepartmentManager `json:"manages"` //部门管理员 45 Manages []DepartmentManager `json:"manages"` //部门管理员
45 Member int64 `json:"member"` //成员数 46 Member int64 `json:"member"` //成员数
46 } 47 }
@@ -352,6 +352,7 @@ func DepartmentListAll(companyId int64) ([]protocol.ResponseDepartmentInfo, erro @@ -352,6 +352,7 @@ func DepartmentListAll(companyId int64) ([]protocol.ResponseDepartmentInfo, erro
352 ID: v.Id, CompanyID: v.CompanyId, 352 ID: v.Id, CompanyID: v.CompanyId,
353 Name: v.Name, Member: cnt, 353 Name: v.Name, Member: cnt,
354 ParantID: v.ParentId, 354 ParantID: v.ParentId,
  355 + ParentName: v.Name,
355 } 356 }
356 var manage []protocol.DepartmentManager 357 var manage []protocol.DepartmentManager
357 manage = v.GetManages() 358 manage = v.GetManages()