mmm-go / opp · 提交

转到一个项目

作者 yangfu
提交 a7e2dec3f59ddfa420f92dbada987d8162d3df94 1 个父辈 faa74cfa

机会修改

内嵌 并排对比
正在显示 4 个修改的文件 包含 32 行增加 和 22 行删除
... ... @@ -115,6 +115,16 @@ func GetUserByUcid(ucid int64) (v *User, err error) {
return nil, err
}
//按公司编号获取管理员编号
func GetUserByCompanyId(cid int64) (v *User, err error) {
o := orm.NewOrm()
sql := "select id,nick_name from `user` where id = (select admin_id from company where id=? and enable=1) and enable_status=1"
if err = o.Raw(sql, cid).QueryRow(&v); err == nil {
return v, nil
}
return nil, err
}
func GetUserByUcidEnable(ucid int64) (v *User, err error) {
o := orm.NewOrm()
sql := "select id,nick_name from `user` where id = (select user_id from user_company where user_company.id=? and user_company.enable=1) and enable_status=1"
... ...
... ... @@ -14,14 +14,14 @@ func GetChancePool(uid, cid int64, chanceTypeId int, lastId int64, pageSize int,
checkMap map[int]int
specialDIds []int64
userDIds []int64
company *models.Company
user *models.User
)
if company, err = models.GetCompanyById(cid); err != nil {
if user, err = models.GetUserByCompanyId(cid); err != nil {
log.Error(err)
return
}
//公司管理员有所有权限
if company.AdminId == uid {
if user.Id == uid {
check = 4
} else {
if op, e := GetUserPermission(uid); e == nil {
... ... @@ -35,7 +35,7 @@ func GetChancePool(uid, cid int64, chanceTypeId int, lastId int64, pageSize int,
specialDIds = append(specialDIds, 0)
}
}
log.Debug(fmt.Sprintf("user:%v check:%v is_amdin:%v", uid, check, company.AdminId == uid))
log.Debug(fmt.Sprintf("user:%v check:%v is_amdin:%v", uid, check, user.Id == uid))
switch check {
case OpportunityCheckLv1:
return models.GetChancePoolMyself(uid, cid, chanceTypeId, lastId, pageSize, v)
... ... @@ -69,14 +69,14 @@ func ValidChancePermission(uid, cid int64, items []*protocol.CommonListItem) (er
checkMap map[int]int
specialDIds []int64
userDIds []int64
company *models.Company
user *models.User
)
if company, err = models.GetCompanyById(cid); err != nil {
if user, err = models.GetUserByCompanyId(cid); err != nil {
log.Error(err)
return
}
//公司管理员有所有权限
if company.AdminId == uid {
if user.Id == uid {
check = 4
} else {
if op, e := GetUserPermission(uid); e == nil {
... ... @@ -93,7 +93,7 @@ func ValidChancePermission(uid, cid int64, items []*protocol.CommonListItem) (er
specialDIds = append(specialDIds, 0)
}
}
log.Debug(fmt.Sprintf("user:%v check:%v is_admin:%v", uid, check, company.AdminId == uid))
log.Debug(fmt.Sprintf("user:%v check:%v is_admin:%v", uid, check, user.Id == uid))
for i := range items {
if items[i].ChanceStatus != 0 {
continue
... ...
... ... @@ -414,7 +414,7 @@ func ChanceApprove(header *protocol.RequestHeader, request *protocol.ChanceAppro
}
}
}
if err = saveApproveMsgByApproveData(orm, request.ReviewStatus, chance, request.ApproveData); err != nil {
if err = saveApproveMsgByApproveData(header, orm, request.ReviewStatus, chance, request.ApproveData); err != nil {
orm.Rollback()
log.Error("发送审核日志失败", err)
return
... ... @@ -477,7 +477,7 @@ func ProcessIntegrate(header *protocol.RequestHeader, request *ProcessIntegrateR
}
//发送审核日志
func saveApproveMsgByApproveData(orm orm.Ormer, reviewStatus int, chance *models.Chance, approveData protocol.ApproveData) (err error) {
func saveApproveMsgByApproveData(header *protocol.RequestHeader, orm orm.Ormer, reviewStatus int, chance *models.Chance, approveData protocol.ApproveData) (err error) {
var (
parames = make([]interface{}, 0)
code = 0
... ... @@ -503,7 +503,7 @@ func saveApproveMsgByApproveData(orm orm.Ormer, reviewStatus int, chance *models
parames = append(parames, strings.Join(department, ","))
}
}
if err = agg.SaveApproveLog(orm, code, chance.UserId, chance.Id, parames...); err != nil {
if err = agg.SaveApproveLog(orm, code, header.UserId, chance.Id, parames...); err != nil {
log.Error(err)
return
}
... ...
... ... @@ -480,7 +480,7 @@ func setChanceAutoPass(header *protocol.RequestHeader, chance *models.Chance, or
log.Error(err)
return
}
if err = agg.SaveApproveLog(orm, 6, chance.UserId, chance.Id, approveData.Score.BasicScore, approveData.Score.ExtraScore, approveData.Score.ValueScore); err != nil {
if err = agg.SaveApproveLog(orm, 6, header.UserId, chance.Id, approveData.Score.BasicScore, approveData.Score.ExtraScore, approveData.Score.ValueScore); err != nil {
log.Error(err)
//orm.Rollback()
return
... ... @@ -809,7 +809,7 @@ func ChanceChangeScore(header *protocol.RequestHeader, request *protocol.ChanceC
return
}
//修改评分日志
if err = agg.SaveApproveLog(orm, 9, chance.UserId, chance.Id, request.Score.BasicScore, request.Score.ExtraScore, request.Score.ValueScore); err != nil {
if err = agg.SaveApproveLog(orm, 9, header.UserId, chance.Id, request.Score.BasicScore, request.Score.ExtraScore, request.Score.ValueScore); err != nil {
log.Error(err)
return
}
... ... @@ -1918,7 +1918,7 @@ func Permission(header *protocol.RequestHeader, request *protocol.PermissionRequ
chance *models.Chance
auditProcess []*models.AuditFlowProcess
isApproving bool //是否审核中
company *models.Company
user *models.User
)
rsp = &protocol.PermissionResponse{}
if op, err = agg.GetUserPermission(header.UserId); err == nil {
... ... @@ -1940,22 +1940,22 @@ func Permission(header *protocol.RequestHeader, request *protocol.PermissionRequ
rsp.EditPublicStatus = 1
rsp.EditScore = 1
}
if company, err = models.GetCompanyById(header.CompanyId); err != nil {
//无权限
noPermission := func() {
rsp.EditChance = 0
rsp.EditPublicStatus = 0
rsp.EditScore = 0
}
if user, err = models.GetUserByCompanyId(header.CompanyId); err != nil {
log.Error(err)
return
}
//公司管理员有所有权限
if company.AdminId == header.UserId {
if user.Id == header.UserId {
rsp.Check = 4
allPermission()
return
}
//无权限
noPermission := func() {
rsp.EditChance = 0
rsp.EditPublicStatus = 0
rsp.EditScore = 0
}
//判断机会权限
if request.ChanceId > 0 {
if chance, err = models.GetChanceById(request.ChanceId); err != nil {
... ...