|
...
|
...
|
@@ -7,7 +7,6 @@ import ( |
|
|
|
"oppmg/common/log"
|
|
|
|
"oppmg/models"
|
|
|
|
"oppmg/protocol"
|
|
|
|
"oppmg/services/agg"
|
|
|
|
"oppmg/utils"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
...
|
...
|
@@ -321,11 +320,15 @@ func TemplateList(uid, companyId int64, request *protocol.TemplateListRequest) ( |
|
|
|
//1.检查可见性
|
|
|
|
|
|
|
|
//2.可见对象 VisibleObject
|
|
|
|
if temp.VisibleType == models.VisibleTypeDepartment {
|
|
|
|
if vObj, err = agg.GetVisibleObject(temp.VisibleObject); err != nil {
|
|
|
|
log.Error(err.Error())
|
|
|
|
return
|
|
|
|
}
|
|
|
|
//if temp.VisibleType == models.VisibleTypeDepartment {
|
|
|
|
//
|
|
|
|
//}
|
|
|
|
//if vObj, err = agg.GetVisibleObject(temp.VisibleObject); err != nil {
|
|
|
|
// log.Error(err.Error())
|
|
|
|
// return
|
|
|
|
//}
|
|
|
|
if e := json.Unmarshal([]byte(temp.VisibleObject), &vObj); e != nil {
|
|
|
|
log.Error("%v %v %v", temp.Id, temp.VisibleObject, e.Error())
|
|
|
|
}
|
|
|
|
tempItem := &protocol.TemplateItem{
|
|
|
|
Id: temp.Id,
|
...
|
...
|
|
