补充机会消息修改

@@ -762,7 +762,7 @@ func CheckChanceDifferent(header *protocol.RequestHeader, chance *models.Chance,
 			}
 			}
 			if isDiff {
 			if isDiff {
 				reviseContents = append(reviseContents, protocol.ReviseContent{
 				reviseContents = append(reviseContents, protocol.ReviseContent{
-					Content: fmt.Sprintf("将“%v”由“%v”改为 “%v“", dis[i].Label, srcValue, dis[i].Value)})
+					Content: fmt.Sprintf("将“%v”由“%v”改为 “%v”", dis[i].Label, srcValue, dis[i].Value)})
 				checkIsSaveLog()
 				checkIsSaveLog()
 			}
 			}
 		}
 		}

@@ -330,7 +330,7 @@ type RankDiscovery struct{}
 
 
 func (rank RankDiscovery) RankUser(o RankOption) (err error, result RankResult) {
 func (rank RankDiscovery) RankUser(o RankOption) (err error, result RankResult) {
 	var (
 	var (
-		sql = `select sum(discovery_score) score,count(0) total from chance where user_id =? and review_status=3 and status=1
+		sql = `select sum(discovery_score) score,count(0) total from chance where user_id =? and review_status=3 and status=1 and enable_status=1
 	and UNIX_TIMESTAMP(approve_time)>=? and UNIX_TIMESTAMP(approve_time)<?`
 	and UNIX_TIMESTAMP(approve_time)>=? and UNIX_TIMESTAMP(approve_time)<?`
 		score float64
 		score float64
 		total int
 		total int
@@ -346,7 +346,7 @@ func (rank RankDiscovery) RankUser(o RankOption) (err error, result RankResult)
 }
 }
 func (rank RankDiscovery) RankDepartment(o RankOption) (err error, result RankResult) {
 func (rank RankDiscovery) RankDepartment(o RankOption) (err error, result RankResult) {
 	var (
 	var (
-		sql = `select sum(discovery_score) score,count(0) total from chance where department_id =? and review_status=3 and status=1
+		sql = `select sum(discovery_score) score,count(0) total from chance where department_id =? and review_status=3 and status=1 and enable_status=1
 	and UNIX_TIMESTAMP(approve_time)>=? and UNIX_TIMESTAMP(approve_time)<?
 	and UNIX_TIMESTAMP(approve_time)>=? and UNIX_TIMESTAMP(approve_time)<?
 `
 `
 		score float64
 		score float64
@@ -367,10 +367,13 @@ type RankGrasp struct{}
 
 
 func (rank RankGrasp) RankUser(o RankOption) (err error, result RankResult) {
 func (rank RankGrasp) RankUser(o RankOption) (err error, result RankResult) {
 	var (
 	var (
-		sql = `select sum(a.user_grasp_score) score from(
-select user_grasp_score from achievement where user_company_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+		sql = `
+select sum(a.user_grasp_score) score from(
+select user_grasp_score from achievement where user_company_id=? and status=1 and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<? 
 UNION ALL
 UNION ALL
-select user_grasp_score from achievement_provider where user_company_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+select b.user_grasp_score from (
+select user_grasp_score,achievement_id from achievement_provider where user_company_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+)b inner join achievement c on b.achievement_id = c.id and status=1
 ) a
 ) a
 `
 `
 		score float64
 		score float64
@@ -386,9 +389,11 @@ select user_grasp_score from achievement_provider where user_company_id=? and UN
 func (rank RankGrasp) RankDepartment(o RankOption) (err error, result RankResult) {
 func (rank RankGrasp) RankDepartment(o RankOption) (err error, result RankResult) {
 	var (
 	var (
 		sql = `select sum(a.user_grasp_score) score from(
 		sql = `select sum(a.user_grasp_score) score from(
-select user_grasp_score from achievement where department_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+select user_grasp_score from achievement where department_id=? and status=1 and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
 UNION ALL
 UNION ALL
-select user_grasp_score from achievement_provider where department_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+select b.user_grasp_score from (
+select user_grasp_score,achievement_id from achievement_provider where department_id=? and UNIX_TIMESTAMP(create_at) >=? and UNIX_TIMESTAMP(create_at)<?
+)b inner join achievement c on b.achievement_id = c.id and status=1
 ) a
 ) a
 `
 `
 		score float64
 		score float64