权限修改

@@ -112,7 +112,7 @@ func GetChanceMyChance(uid, cid int64, reviewStatus []int8, lastId int64, pageSi
 	sql := `select a.*,b.images,speechs,videos 
 	sql := `select a.*,b.images,speechs,videos 
 from (
 from (
 select id,user_id,create_at,update_at,approve_time chance_approve_time,source_content,approve_data,review_status,enable_status,status from chance
 select id,user_id,create_at,update_at,approve_time chance_approve_time,source_content,approve_data,review_status,enable_status,status from chance
-where user_id=? and company_id=? and review_status in (?)  and (?=0 or id<?)
+where user_id=? and company_id=? and review_status in (?)  and (?=0 or id<?) and status==1
 ) a left JOIN chance_data b on a.id =b.chance_id
 ) a left JOIN chance_data b on a.id =b.chance_id
 order by update_at desc
 order by update_at desc
 limit ? 
 limit ? 

@@ -582,7 +582,7 @@ type ChanceItem struct {
 	Speechs        []Speech      `json:"speechs"`
 	Speechs        []Speech      `json:"speechs"`
 	Pictures       []Picture     `json:"pictures"`
 	Pictures       []Picture     `json:"pictures"`
 	Videos         []Video       `json:"videos"`
 	Videos         []Video       `json:"videos"`
-	PublicStatus   int           `json:"public_status"`
+	PublicStatus   int           `json:"-"` //publicStatus
 }
 }
 type ChanceData struct {
 type ChanceData struct {
 	ThumbsUpTotal int `json:"thumbsupTotal"` //点赞总数
 	ThumbsUpTotal int `json:"thumbsupTotal"` //点赞总数

@@ -1931,16 +1931,27 @@ func Permission(header *protocol.RequestHeader, request *protocol.PermissionRequ
 	for i := range op.CheckOption.Departments {
 	for i := range op.CheckOption.Departments {
 		rsp.DepartmentIds = append(rsp.DepartmentIds, op.CheckOption.Departments[i].Id)
 		rsp.DepartmentIds = append(rsp.DepartmentIds, op.CheckOption.Departments[i].Id)
 	}
 	}
+	//所有权限
+	allPermission := func() {
+		rsp.EditChance = 1
+		rsp.EditPublicStatus = 1
+		rsp.EditScore = 1
+	}
+	//无权限
+	noPermission := func() {
+		rsp.EditChance = 0
+		rsp.EditPublicStatus = 0
+		rsp.EditScore = 0
+	}
 	//判断机会权限
 	//判断机会权限
 	if request.ChanceId > 0 {
 	if request.ChanceId > 0 {
 		if chance, err = models.GetChanceById(request.ChanceId); err != nil {
 		if chance, err = models.GetChanceById(request.ChanceId); err != nil {
 			err = protocol.NewErrWithMessage(5101)
 			err = protocol.NewErrWithMessage(5101)
 			return
 			return
 		}
 		}
-		if chance.Status == models.ChanceStatusClose || chance.EnableStatus == 0 { //机会关闭 / 删除
-			rsp.EditChance = 0
-			rsp.EditPublicStatus = 0
-			rsp.EditScore = 0
+		//机会关闭 / 删除
+		if chance.Status == models.ChanceStatusClose || chance.EnableStatus == 0 {
+			noPermission()
 			log.Debug(fmt.Sprintf("用户:%v chance_id:%v 机会关闭/删除 无权限", header.UserId, chance.Id))
 			log.Debug(fmt.Sprintf("用户:%v chance_id:%v 机会关闭/删除 无权限", header.UserId, chance.Id))
 			return
 			return
 		}
 		}
@@ -1948,31 +1959,29 @@ func Permission(header *protocol.RequestHeader, request *protocol.PermissionRequ
 		if chance.UserId == header.UserId {
 		if chance.UserId == header.UserId {
 			//审核通过 或者 已经被人审核过 就不能编辑了
 			//审核通过 或者 已经被人审核过 就不能编辑了
 			if len(chance.ApproveData) > 0 && chance.ReviewStatus == protocol.ReviewStatusAuditging { //审批中 且有人审批 本人不可编辑
 			if len(chance.ApproveData) > 0 && chance.ReviewStatus == protocol.ReviewStatusAuditging { //审批中 且有人审批 本人不可编辑
-				rsp.EditChance = 0
+				noPermission()
 			} else if chance.ReviewStatus == protocol.ReviewStatusAuditging { //未有人审核过
 			} else if chance.ReviewStatus == protocol.ReviewStatusAuditging { //未有人审核过
 				rsp.EditChance = 1
 				rsp.EditChance = 1
 				rsp.EditPublicStatus = 0
 				rsp.EditPublicStatus = 0
 				rsp.EditScore = 0
 				rsp.EditScore = 0
 			}
 			}
 			if chance.ReviewStatus == protocol.ReviewStatusPass {
 			if chance.ReviewStatus == protocol.ReviewStatusPass {
-				rsp.EditScore = 1
+				rsp.EditChance = 1
 			}
 			}
 			return
 			return
-		} else {
-			if chance.ReviewStatus == protocol.ReviewStatusReturn { //退回的机会不可编辑
-				rsp.EditChance = 0
-				rsp.EditPublicStatus = 0
-				rsp.EditScore = 0
-			}
 		}
 		}
+		//他人
 		if chance.UserId != header.UserId {
 		if chance.UserId != header.UserId {
-			//他人
+			if chance.ReviewStatus == protocol.ReviewStatusReturn { //退回的机会不可编辑
+				noPermission()
+				return
+			}
+			//是否是审核人
 			if auditProcess, err = models.GetAuditFlowProcessListByAuditUser(request.ChanceId, header.UserId); err != nil {
 			if auditProcess, err = models.GetAuditFlowProcessListByAuditUser(request.ChanceId, header.UserId); err != nil {
 				if err == orm.ErrNoRows {
 				if err == orm.ErrNoRows {
+					//非审核人 并且 审核状态不是通过的，无所有权限
 					if chance.ReviewStatus != protocol.ReviewStatusPass {
 					if chance.ReviewStatus != protocol.ReviewStatusPass {
-						rsp.EditChance = 0
-						rsp.EditPublicStatus = 0
-						rsp.EditScore = 0
+						noPermission()
 					}
 					}
 					err = nil
 					err = nil
 					return
 					return
@@ -1987,15 +1996,13 @@ func Permission(header *protocol.RequestHeader, request *protocol.PermissionRequ
 			}
 			}
 			//审核进行中
 			//审核进行中
 			if isApproving {
 			if isApproving {
-				rsp.EditChance = 1
+				allPermission()
 			} else if chance.ReviewStatus == protocol.ReviewStatusAuditging && len(auditProcess) > 0 {
 			} else if chance.ReviewStatus == protocol.ReviewStatusAuditging && len(auditProcess) > 0 {
-				rsp.EditChance = 0
+				noPermission()
 				log.Debug(fmt.Sprintf("用户:%v  审核过,并且当前机会在审核中 编辑权限:false", header.UserId))
 				log.Debug(fmt.Sprintf("用户:%v  审核过,并且当前机会在审核中 编辑权限:false", header.UserId))
 			}
 			}
 			if chance.ReviewStatus == protocol.ReviewStatusPass && len(auditProcess) > 0 { //已通过的机会 并且是审批人 有所有编辑权限
 			if chance.ReviewStatus == protocol.ReviewStatusPass && len(auditProcess) > 0 { //已通过的机会 并且是审批人 有所有编辑权限
-				rsp.EditChance = 1
-				rsp.EditPublicStatus = 1
-				rsp.EditScore = 1
+				allPermission()
 			}
 			}
 		}
 		}
 	}
 	}