正在显示
1 个修改的文件
包含
9 行增加
和
6 行删除
@@ -7,7 +7,6 @@ import ( | @@ -7,7 +7,6 @@ import ( | ||
7 | "oppmg/common/log" | 7 | "oppmg/common/log" |
8 | "oppmg/models" | 8 | "oppmg/models" |
9 | "oppmg/protocol" | 9 | "oppmg/protocol" |
10 | - "oppmg/services/agg" | ||
11 | "oppmg/utils" | 10 | "oppmg/utils" |
12 | "strings" | 11 | "strings" |
13 | "time" | 12 | "time" |
@@ -321,11 +320,15 @@ func TemplateList(uid, companyId int64, request *protocol.TemplateListRequest) ( | @@ -321,11 +320,15 @@ func TemplateList(uid, companyId int64, request *protocol.TemplateListRequest) ( | ||
321 | //1.检查可见性 | 320 | //1.检查可见性 |
322 | 321 | ||
323 | //2.可见对象 VisibleObject | 322 | //2.可见对象 VisibleObject |
324 | - if temp.VisibleType == models.VisibleTypeDepartment { | ||
325 | - if vObj, err = agg.GetVisibleObject(temp.VisibleObject); err != nil { | ||
326 | - log.Error(err.Error()) | ||
327 | - return | ||
328 | - } | 323 | + //if temp.VisibleType == models.VisibleTypeDepartment { |
324 | + // | ||
325 | + //} | ||
326 | + //if vObj, err = agg.GetVisibleObject(temp.VisibleObject); err != nil { | ||
327 | + // log.Error(err.Error()) | ||
328 | + // return | ||
329 | + //} | ||
330 | + if e := json.Unmarshal([]byte(temp.VisibleObject), &vObj); e != nil { | ||
331 | + log.Error("%v %v %v", temp.Id, temp.VisibleObject, e.Error()) | ||
329 | } | 332 | } |
330 | tempItem := &protocol.TemplateItem{ | 333 | tempItem := &protocol.TemplateItem{ |
331 | Id: temp.Id, | 334 | Id: temp.Id, |
-
请 注册 或 登录 后发表评论